diff --git a/[refs] b/[refs] index 0579ce899f3e..00d270405e72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e486463e82e4dca9e8f4413649088b21c9ff87e5 +refs/heads/master: efc27f8ceebe5eb147fa31d6c995706d327ad855 diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index 87b424ae750a..21086036e348 100644 --- a/trunk/include/net/sock.h +++ b/trunk/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;