Linux Ethernet Bridging - Sep 2016 - [Bridge] [PATCH net] net: bridge: don't increment tx_dropped in br_do_proxy_arp

pskb_may_pull may fail due to various reasons (e.g. alloc failure), but the
skb isn't changed/dropped and processing continues so we shouldn't
increment tx_dropped.

CC: Kyeyoon Park <kyeyoonp at codeaurora.org>
CC: Roopa Prabhu <roopa at cumulusnetworks.com>
CC: Stephen Hemminger <stephen at networkplumber.org>
CC: bridge at lists.linux-foundation.org
Fixes: 958501163ddd ("bridge: Add support for IEEE 802.11 Proxy ARP")
Signed-off-by: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>
---
 net/bridge/br_input.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 8e486203d133..abe11f085479 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -80,13 +80,10 @@ static void br_do_proxy_arp(struct sk_buff *skb, struct
net_bridge *br,
 
 	BR_INPUT_SKB_CB(skb)->proxyarp_replied = false;
 
-	if (dev->flags & IFF_NOARP)
+	if ((dev->flags & IFF_NOARP) ||
+	    !pskb_may_pull(skb, arp_hdr_len(dev)))
 		return;
 
-	if (!pskb_may_pull(skb, arp_hdr_len(dev))) {
-		dev->stats.tx_dropped++;
-		return;
-	}
 	parp = arp_hdr(skb);
 
 	if (parp->ar_pro != htons(ETH_P_IP) ||
-- 
2.1.4

From: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>
Date: Tue, 30 Aug 2016 17:44:29 +0200
> pskb_may_pull may fail due to various reasons (e.g. alloc failure), but the
> skb isn't changed/dropped and processing continues so we shouldn't
> increment tx_dropped.
> 
> CC: Kyeyoon Park <kyeyoonp at codeaurora.org>
> CC: Roopa Prabhu <roopa at cumulusnetworks.com>
> CC: Stephen Hemminger <stephen at networkplumber.org>
> CC: bridge at lists.linux-foundation.org
> Fixes: 958501163ddd ("bridge: Add support for IEEE 802.11 Proxy
ARP")
> Signed-off-by: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>
Applied, thanks.