forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net: Remove 'unlikely' qualifier in skb_steal_sock()

Browse source 
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: Vijay Subramanian <subramanian.vijay@gmail.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vijay Subramanian 2012-06-24 13:03:07 +00:00 • committed by David S. Miller
commit efc27f8cee
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/net/sock.h
View file

@ -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;