---

yaml --- r: 314579 b: refs/heads/master c: efc27f8 h: refs/heads/master i: 314577: 293ee87 314575: d4f6418 v: v3
git-mirror · Jun 25, 2012 · febb9c0 · febb9c0
1 parent 3392614
commit febb9c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;