From febb9c05e47ec088c05817ef4a9359b21604014e Mon Sep 17 00:00:00 2001
From: Vijay Subramanian <subramanian.vijay@gmail.com>
Date: Sun, 24 Jun 2012 13:03:07 +0000
Subject: [PATCH] --- yaml --- r: 314579 b: refs/heads/master c:
 efc27f8ceebe5eb147fa31d6c995706d327ad855 h: refs/heads/master i:   314577:
 293ee87eb2366754c351f08d5899f586ee945b81   314575:
 d4f641855d0fbb90457e3eabdc41591e1781391f v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/sock.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;