---

yaml --- r: 171501 b: refs/heads/master c: e84af6d h: refs/heads/master i: 171499: 8c4f01c v: v3
git-mirror · Nov 12, 2009 · c86870c · c86870c
1 parent 1c19512
commit c86870c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 434a8a58d75faa7170807a7ac2fcf7f3d85a0dc3
+refs/heads/master: e84af6ddef0e447c56b256a2bb5a90af11bdac2e
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
@@ -493,6 +493,9 @@ int skb_recycle_check(struct sk_buff *skb, int skb_size)
 {
 	struct skb_shared_info *shinfo;
 
+	if (irqs_disabled())
+		return 0;
+
 	if (skb_is_nonlinear(skb) || skb->fclone != SKB_FCLONE_UNAVAILABLE)
 		return 0;