From bfef1b79fa2d3422c772015f0f6f24ad50f150e4 Mon Sep 17 00:00:00 2001
From: Cristian Bercaru <B43982@freescale.com>
Date: Fri, 8 Mar 2013 07:03:38 +0000
Subject: [PATCH] --- yaml --- r: 361115 b: refs/heads/master c:
 3bc1b1add7a8484cc4a261c3e128dbe1528ce01f h: refs/heads/master i:   361113:
 41359e301f47eba9f65f7f146d6e21ca9b017321   361111:
 eabdd9b715b2fe8d93d4c8ffe1b2d8c1b5be8b3d v: v3

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

diff --git a/[refs] b/[refs]
index 22b6bd888801..8542420bf362 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6a8fe950e1b8596bb06f2c89c3a1a4bf2011ba9
+refs/heads/master: 3bc1b1add7a8484cc4a261c3e128dbe1528ce01f
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 8f152f904f70..dffbef70cd31 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -3444,6 +3444,7 @@ static int __netif_receive_skb_core(struct sk_buff *skb, bool pfmemalloc)
 		}
 		switch (rx_handler(&skb)) {
 		case RX_HANDLER_CONSUMED:
+			ret = NET_RX_SUCCESS;
 			goto unlock;
 		case RX_HANDLER_ANOTHER:
 			goto another_round;