Merge tag 'tag-chrome-platform-for-v5.6' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / net / ipv4 / tcp_minisocks.c

diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index c802bc80c4006f82c2e9189ef1fc11b8f321e70d..ad3b56d9fa7156f724f7558abccb1367fb5ea8d3 100644 (file)
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -414,7 +414,7 @@ void tcp_ca_openreq_child(struct sock *sk, const struct dst_entry *dst)
 
                rcu_read_lock();
                ca = tcp_ca_find_key(ca_key);
-               if (likely(ca && try_module_get(ca->owner))) {
+               if (likely(ca && bpf_try_module_get(ca, ca->owner))) {
                        icsk->icsk_ca_dst_locked = tcp_ca_dst_locked(dst);
                        icsk->icsk_ca_ops = ca;
                        ca_got_dst = true;
@@ -425,7 +425,7 @@ void tcp_ca_openreq_child(struct sock *sk, const struct dst_entry *dst)
        /* If no valid choice made yet, assign current system default ca. */
        if (!ca_got_dst &&
            (!icsk->icsk_ca_setsockopt ||
-            !try_module_get(icsk->icsk_ca_ops->owner)))
+            !bpf_try_module_get(icsk->icsk_ca_ops, icsk->icsk_ca_ops->owner)))
                tcp_assign_congestion_control(sk);
 
        tcp_set_ca_state(sk, TCP_CA_Open);