X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=net%2Fbridge%2Fbr_input.c;h=abe11f085479c62d5ac969d8d2d13aa5a6f762db;hb=3e454fd5db5f993a829160cd9783b759a63931af;hp=8e486203d133a7f9158f94fda6dbd03ace32c52b;hpb=a71e36045e1fd5813addad2fce878d96e2827d66;p=cascardo%2Flinux.git

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) ||