summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Bercaru <B43982@freescale.com>2013-03-08 07:03:38 +0000
committerDavid S. Miller <davem@davemloft.net>2013-03-08 12:19:59 -0500
commit3bc1b1add7a8484cc4a261c3e128dbe1528ce01f (patch)
treecfe45cd4e2280b0cf84053b5f3838d9076f5b878
parenta6a8fe950e1b8596bb06f2c89c3a1a4bf2011ba9 (diff)
downloadlinux-stable-3bc1b1add7a8484cc4a261c3e128dbe1528ce01f.tar.gz
linux-stable-3bc1b1add7a8484cc4a261c3e128dbe1528ce01f.tar.bz2
linux-stable-3bc1b1add7a8484cc4a261c3e128dbe1528ce01f.zip
bridging: fix rx_handlers return code
The frames for which rx_handlers return RX_HANDLER_CONSUMED are no longer counted as dropped. They are counted as successfully received by 'netif_receive_skb'. This allows network interface drivers to correctly update their RX-OK and RX-DRP counters based on the result of 'netif_receive_skb'. Signed-off-by: Cristian Bercaru <B43982@freescale.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/dev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 8f152f904f70..dffbef70cd31 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3444,6 +3444,7 @@ ncls:
}
switch (rx_handler(&skb)) {
case RX_HANDLER_CONSUMED:
+ ret = NET_RX_SUCCESS;
goto unlock;
case RX_HANDLER_ANOTHER:
goto another_round;