---

yaml --- r: 361115 b: refs/heads/master c: 3bc1b1a h: refs/heads/master i: 361113: 41359e3 361111: eabdd9b v: v3
git-mirror · Mar 8, 2013 · bfef1b7 · bfef1b7
1 parent 421c2d4
commit bfef1b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;