Commit efc27f8c authored by Vijay Subramanian's avatar Vijay Subramanian Committed by David S. Miller
Browse files

net: Remove 'unlikely' qualifier in skb_steal_sock()



With early demux enabled by default for TCP flows, there is high chance that
skb->sk will be non-null. 'unlikely()' was removed from __inet_lookup_skb() but
maybe it can be removed from skb_steal_sock() as well.

Note: skb_steal_sock() is also called by __inet6_lookup_skb() and
__udp4_lib_lookup_skb() but they are protected by their own 'unlikely' calls.
Signed-off-by: default avatarVijay Subramanian <subramanian.vijay@gmail.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e486463e
...@@ -2154,7 +2154,7 @@ static inline void sk_change_net(struct sock *sk, struct net *net) ...@@ -2154,7 +2154,7 @@ static inline void sk_change_net(struct sock *sk, struct net *net)
static inline struct sock *skb_steal_sock(struct sk_buff *skb) static inline struct sock *skb_steal_sock(struct sk_buff *skb)
{ {
if (unlikely(skb->sk)) { if (skb->sk) {
struct sock *sk = skb->sk; struct sock *sk = skb->sk;
skb->destructor = NULL; skb->destructor = NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment