aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorCristian Bercaru <B43982@freescale.com>2013-03-08 07:03:38 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-20 12:58:54 -0700
commitb8268476626db0dac71fad35da5532e32f6a879e (patch)
tree8f546b573368257b17c5f5866b2d2ab39837ecbe /net
parent6ae1c7c9e9da70544a23906e4433223a58bdec11 (diff)
downloadkernel_samsung_smdk4412-b8268476626db0dac71fad35da5532e32f6a879e.zip
kernel_samsung_smdk4412-b8268476626db0dac71fad35da5532e32f6a879e.tar.gz
kernel_samsung_smdk4412-b8268476626db0dac71fad35da5532e32f6a879e.tar.bz2
bridging: fix rx_handlers return code
[ Upstream commit 3bc1b1add7a8484cc4a261c3e128dbe1528ce01f ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to '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 465f1f6..ed1f0ca 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3165,6 +3165,7 @@ ncls:
}
switch (rx_handler(&skb)) {
case RX_HANDLER_CONSUMED:
+ ret = NET_RX_SUCCESS;
goto out;
case RX_HANDLER_ANOTHER:
goto another_round;