| Date | Mon, 25 Mar 2013 01:05:36 +0000 | From | Ben Hutchings <> | Subject | [ 012/104] bridging: fix rx_handlers return code |
| |
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cristian Bercaru <B43982@freescale.com>
[ 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: Ben Hutchings <ben@decadent.org.uk> --- net/core/dev.c | 1 + 1 file changed, 1 insertion(+)
--- a/net/core/dev.c +++ b/net/core/dev.c @@ -3299,6 +3299,7 @@ ncls: } switch (rx_handler(&skb)) { case RX_HANDLER_CONSUMED: + ret = NET_RX_SUCCESS; goto out; case RX_HANDLER_ANOTHER: goto another_round;
|