Return-Path: Message-Id: <20130326173608.583813675@goodmis.org> Date: Tue, 26 Mar 2013 13:21:53 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Cristian Bercaru , Eric Dumazet , "David S. Miller" Subject: [PATCH 54/86] bridging: fix rx_handlers return code References: <20130326172059.136127374@goodmis.org> Content-Disposition: inline; filename=0054-bridging-fix-rx_handlers-return-code.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Cristian Bercaru [ 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 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller --- net/core/dev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/core/dev.c b/net/core/dev.c index 1dce5b5..c41efb7 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3296,6 +3296,7 @@ ncls: } switch (rx_handler(&skb)) { case RX_HANDLER_CONSUMED: + ret = NET_RX_SUCCESS; goto unlock; case RX_HANDLER_ANOTHER: goto another_round; -- 1.7.10.4