From: Vijay Subramanian Date: Sun, 24 Jun 2012 13:03:07 +0000 (+0000) Subject: net: Remove 'unlikely' qualifier in skb_steal_sock() X-Git-Tag: v3.6-rc1~125^2~452 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efc27f8ceebe5eb147fa31d6c995706d327ad855;p=pandora-kernel.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 Acked-by: Eric Dumazet Signed-off-by: David S. Miller --- Reading git-diff-tree failed