aboutsummaryrefslogtreecommitdiff
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 13:10:58 -0700
commitf1e2adbba7d7f1fab29713efd3fa47324ef02ad5 (patch)
tree2e1d99cf3f4c7c3bac8c07556c3880242e1ca84c /net
parentd99d0841478544ae82e224deb5101fec4ca2ff65 (diff)
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 f64e439b4a00..1339f77e3891 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3419,6 +3419,7 @@ ncls:
}
switch (rx_handler(&skb)) {
case RX_HANDLER_CONSUMED:
+ ret = NET_RX_SUCCESS;
goto unlock;
case RX_HANDLER_ANOTHER:
goto another_round;