---

yaml --- r: 323077 b: refs/heads/master c: 0e698bf h: refs/heads/master i: 323075: 994f81a v: v3
git-mirror · Sep 18, 2012 · ac9094a · ac9094a
1 parent 430d0e5
commit ac9094a
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: e4d1aa40e363ed3e0486aeeeb0d173f7f822737e
+refs/heads/master: 0e698bf6624c469cd4f3f391247b142963ca9c4e
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -3322,7 +3322,7 @@ static int __netif_receive_skb(struct sk_buff *skb)
 
 	if (pt_prev) {
 		if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC)))
-			ret = -ENOMEM;
+			goto drop;
 		else
 			ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
 	} else {