diff options
| author |   Rick Jones <rick.jones2@hp.com> | 2014-09-25 10:55:28 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-09-28 17:30:35 -0400 |
| commit | 825bae5d97d351ddf9720400df133fc4b1bc6a13 (patch) | |
| tree | 2a6e8fd84737d9d283a92b4820007a3ea39c829a /net/ipv4/arp.c | |
| parent | net_sched: remove the first parameter from tcf_exts_destroy() (diff) | |
| download | linux-dev-825bae5d97d351ddf9720400df133fc4b1bc6a13.tar.xz linux-dev-825bae5d97d351ddf9720400df133fc4b1bc6a13.zip | |
arp: Do not perturb drop profiles with ignored ARP packets
We do not wish to disturb dropwatch or perf drop profiles with an ARP
we will ignore.
Signed-off-by: Rick Jones <rick.jones2@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/arp.c')
| -rw-r--r-- | net/ipv4/arp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 1a9b99e04465..16acb59d665e 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -953,10 +953,11 @@ static int arp_rcv(struct sk_buff *skb, struct net_device *dev, { const struct arphdr *arp; + /* do not tweak dropwatch on an ARP we will ignore */ if (dev->flags & IFF_NOARP || skb->pkt_type == PACKET_OTHERHOST || skb->pkt_type == PACKET_LOOPBACK) - goto freeskb; + goto consumeskb; skb = skb_share_check(skb, GFP_ATOMIC); if (!skb) @@ -974,6 +975,9 @@ static int arp_rcv(struct sk_buff *skb, struct net_device *dev, return NF_HOOK(NFPROTO_ARP, NF_ARP_IN, skb, dev, NULL, arp_process); +consumeskb: + consume_skb(skb); + return 0; freeskb: kfree_skb(skb); out_of_mem: |