From 873c5bf77566ec11e498571abec45759bacc15d9 Mon Sep 17 00:00:00 2001
From: Eric Leblond <eric@regit.org>
Date: Tue, 6 Nov 2012 02:10:10 +0000
Subject: [PATCH] --- yaml --- r: 335590 b: refs/heads/master c:
 a3d744e995d2b936c500585ae39d99ee251c89b4 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2ac832e3eeb9..ecbde5de2ceb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3015f3d2a3cd9614294025849d3ed89fd2f3a7f5
+refs/heads/master: a3d744e995d2b936c500585ae39d99ee251c89b4
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 09cb3f6dc40c..bda6d004f9f0 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1666,7 +1666,7 @@ static inline int deliver_skb(struct sk_buff *skb,
 
 static inline bool skb_loop_sk(struct packet_type *ptype, struct sk_buff *skb)
 {
-	if (ptype->af_packet_priv == NULL)
+	if (!ptype->af_packet_priv || !skb->sk)
 		return false;
 
 	if (ptype->id_match)