* [PATCH net] net: bridge: don't increment tx_dropped in br_do_proxy_arp
@ 2016-08-30 15:44 Nikolay Aleksandrov
2016-09-01 23:35 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Nikolay Aleksandrov @ 2016-08-30 15:44 UTC (permalink / raw)
To: netdev
Cc: Nikolay Aleksandrov, Kyeyoon Park, Roopa Prabhu,
Stephen Hemminger, bridge
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@codeaurora.org>
CC: Roopa Prabhu <roopa@cumulusnetworks.com>
CC: Stephen Hemminger <stephen@networkplumber.org>
CC: bridge@lists.linux-foundation.org
Fixes: 958501163ddd ("bridge: Add support for IEEE 802.11 Proxy ARP")
Signed-off-by: Nikolay Aleksandrov <nikolay@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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] net: bridge: don't increment tx_dropped in br_do_proxy_arp
2016-08-30 15:44 [PATCH net] net: bridge: don't increment tx_dropped in br_do_proxy_arp Nikolay Aleksandrov
@ 2016-09-01 23:35 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-09-01 23:35 UTC (permalink / raw)
To: nikolay; +Cc: netdev, kyeyoonp, bridge, roopa
From: Nikolay Aleksandrov <nikolay@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@codeaurora.org>
> CC: Roopa Prabhu <roopa@cumulusnetworks.com>
> CC: Stephen Hemminger <stephen@networkplumber.org>
> CC: bridge@lists.linux-foundation.org
> Fixes: 958501163ddd ("bridge: Add support for IEEE 802.11 Proxy ARP")
> Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-09-01 23:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-30 15:44 [PATCH net] net: bridge: don't increment tx_dropped in br_do_proxy_arp Nikolay Aleksandrov
2016-09-01 23:35 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).