summaryrefslogtreecommitdiffstats
path: root/include/net/sock.h
diff options
context:
space:
mode:
authorVijay Subramanian <subramanian.vijay@gmail.com>2012-06-24 13:03:07 +0000
committerDavid S. Miller <davem@davemloft.net>2012-06-25 16:08:36 -0700
commitefc27f8ceebe5eb147fa31d6c995706d327ad855 (patch)
treeb1be53115d0986162941b8964dd3b642715c7681 /include/net/sock.h
parente486463e82e4dca9e8f4413649088b21c9ff87e5 (diff)
downloadop-kernel-dev-efc27f8ceebe5eb147fa31d6c995706d327ad855.zip
op-kernel-dev-efc27f8ceebe5eb147fa31d6c995706d327ad855.tar.gz
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>
Diffstat (limited to 'include/net/sock.h')
-rw-r--r--include/net/sock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 87b424a..2108603 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;
OpenPOWER on IntegriCloud