From ac9094a7e582caa45a98becf43f9fe03db3941e0 Mon Sep 17 00:00:00 2001
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: Sat, 15 Sep 2012 22:44:16 +0000
Subject: [PATCH] --- yaml --- r: 323077 b: refs/heads/master c:
 0e698bf6624c469cd4f3f391247b142963ca9c4e h: refs/heads/master i:   323075:
 994f81a7e72cf510a63e3f50582c0dcba3bb50be v: v3

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

diff --git a/[refs] b/[refs]
index 66586820cb52..02e93d5e4afc 100644
--- 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
index d7fe32c946c1..ac7609d85187 100644
--- 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 {