diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-04-01 17:52:14 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-05 04:11:19 +0200 |
| commit | ee3cf32a4a5e6cf5ccc0f0de9865fda3ebc46436 (patch) | |
| tree | e19b9e382259b432a9ca05fe84c38541814c87c2 /include/net/inet_hashtables.h | |
| parent | udp: no longer use SLAB_DESTROY_BY_RCU (diff) | |
| download | linux-ee3cf32a4a5e6cf5ccc0f0de9865fda3ebc46436.tar.xz linux-ee3cf32a4a5e6cf5ccc0f0de9865fda3ebc46436.zip | |
tcp/dccp: remove BH disable/enable in lookup
Since linux 2.6.29, lookups only use rcu locking.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/inet_hashtables.h')
| -rw-r--r-- | include/net/inet_hashtables.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h index 50f635c2c536..a77acee93aaf 100644 --- a/include/net/inet_hashtables.h +++ b/include/net/inet_hashtables.h @@ -280,11 +280,8 @@ static inline struct sock *inet_lookup_listener(struct net *net, net_eq(sock_net(__sk), (__net))) #endif /* 64-bit arch */ -/* - * Sockets in TCP_CLOSE state are _always_ taken out of the hash, so we need +/* Sockets in TCP_CLOSE state are _always_ taken out of the hash, so we need * not check it for lookups anymore, thanks Alexey. -DaveM - * - * Local BH must be disabled here. */ struct sock *__inet_lookup_established(struct net *net, struct inet_hashinfo *hashinfo, @@ -326,10 +323,8 @@ static inline struct sock *inet_lookup(struct net *net, { struct sock *sk; - local_bh_disable(); sk = __inet_lookup(net, hashinfo, skb, doff, saddr, sport, daddr, dport, dif); - local_bh_enable(); return sk; } |