---

yaml --- r: 335590 b: refs/heads/master c: a3d744e h: refs/heads/master v: v3
git-mirror · Nov 7, 2012 · 873c5bf · 873c5bf
1 parent c5ec946
commit 873c5bf
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: 3015f3d2a3cd9614294025849d3ed89fd2f3a7f5
+refs/heads/master: a3d744e995d2b936c500585ae39d99ee251c89b4
diff --git 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)