diff options
| author |   Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2016-08-30 17:44:29 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-09-01 16:35:30 -0700 |
| commit | 85a3d4a9356b595d5440c3f1bf07ee7cecca1567 (patch) | |
| tree | 9138e94f7bd27a7affbb03ed8a1d9e011a2a599d /net/bridge/br_input.c | |
| parent | netconf: add a notif when settings are created (diff) | |
| download | linux-dev-85a3d4a9356b595d5440c3f1bf07ee7cecca1567.tar.xz linux-dev-85a3d4a9356b595d5440c3f1bf07ee7cecca1567.zip | |
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@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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_input.c')
| -rw-r--r-- | net/bridge/br_input.c | 7 |
1 files 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) || |