From: Vijay Subramanian <subramanian.vijay@gmail.com>
Date: Sun, 24 Jun 2012 13:03:07 +0000 (+0000)
Subject: net: Remove 'unlikely' qualifier in skb_steal_sock()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=efc27f8ceebe5eb147fa31d6c995706d327ad855;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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: Vijay Subramanian <subramanian.vijay@gmail.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/sock.h b/include/net/sock.h
index 87b424ae750a..21086036e348 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -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)
 {
-	if (unlikely(skb->sk)) {
+	if (skb->sk) {
 		struct sock *sk = skb->sk;
 
 		skb->destructor = NULL;