Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux-2.6-microblaze.git] / net / ipv4 / tcp_ipv4.c

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index fedb537..df1166b 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2678,7 +2678,8 @@ static void __net_exit tcp_sk_exit(struct net *net)
        int cpu;
 
        if (net->ipv4.tcp_congestion_control)
-               module_put(net->ipv4.tcp_congestion_control->owner);
+               bpf_module_put(net->ipv4.tcp_congestion_control,
+                              net->ipv4.tcp_congestion_control->owner);
 
        for_each_possible_cpu(cpu)
                inet_ctl_sock_destroy(*per_cpu_ptr(net->ipv4.tcp_sk, cpu));
@@ -2785,7 +2786,8 @@ static int __net_init tcp_sk_init(struct net *net)
 
        /* Reno is always built in */
        if (!net_eq(net, &init_net) &&
-           try_module_get(init_net.ipv4.tcp_congestion_control->owner))
+           bpf_try_module_get(init_net.ipv4.tcp_congestion_control,
+                              init_net.ipv4.tcp_congestion_control->owner))
                net->ipv4.tcp_congestion_control = init_net.ipv4.tcp_congestion_control;
        else
                net->ipv4.tcp_congestion_control = &tcp_reno;