Merge tag 'perf_urgent_for_v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/net/ipv4/tcp_ulp.c b/net/ipv4/tcp_ulp.c
index 38d3ad1..7c27aa6 100644 (file)
--- a/net/ipv4/tcp_ulp.c
+++ b/net/ipv4/tcp_ulp.c
@@ -22,7 +22,8 @@ static struct tcp_ulp_ops *tcp_ulp_find(const char *name)
 {
        struct tcp_ulp_ops *e;
 
-       list_for_each_entry_rcu(e, &tcp_ulp_list, list) {
+       list_for_each_entry_rcu(e, &tcp_ulp_list, list,
+                               lockdep_is_held(&tcp_ulp_list_lock)) {
                if (strcmp(e->name, name) == 0)
                        return e;
        }
@@ -104,12 +105,6 @@ void tcp_update_ulp(struct sock *sk, struct proto *proto,
 {
        struct inet_connection_sock *icsk = inet_csk(sk);
 
-       if (!icsk->icsk_ulp_ops) {
-               sk->sk_write_space = write_space;
-               sk->sk_prot = proto;
-               return;
-       }
-
        if (icsk->icsk_ulp_ops->update)
                icsk->icsk_ulp_ops->update(sk, proto, write_space);
 }