diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2012-03-15 06:25:58 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-17 07:00:20 +0100 |
| commit | 124d37e9f088a8f56494b0264d63d22555f53fef (patch) | |
| tree | 372cf065963b109c0df78964ec196488a570eba5 /net | |
| parent | usbnet: use netif_tx_wake_queue instead of netif_start_queue (diff) | |
| download | linux-124d37e9f088a8f56494b0264d63d22555f53fef.tar.xz linux-124d37e9f088a8f56494b0264d63d22555f53fef.zip | |
arp: allow arp processing to honor per interface arp_accept sysctl
I found recently that the arp_process function which handles all of our received
arp frames, is using IPV4_DEVCONF_ALL macro to check the state of the arp_process
flag. This seems wrong, as it implies that either none or all of the network
interfaces accept gratuitous arps. This patch corrects that, allowing
per-interface arp_accept configuration to deviate from the all setting. Note
this also brings us into line with the way the arp_filter setting is handled
during arp_process execution.
Tested this myself on my home network, and confirmed it works as expected.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
CC: "David S. Miller" <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/arp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 63e49890ad31..73f46d691abc 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -889,7 +889,7 @@ static int arp_process(struct sk_buff *skb) n = __neigh_lookup(&arp_tbl, &sip, dev, 0); - if (IPV4_DEVCONF_ALL(dev_net(dev), ARP_ACCEPT)) { + if (IN_DEV_ARP_ACCEPT(in_dev)) { /* Unsolicited ARP is not accepted by default. It is possible, that this option should be enabled for some devices (strip is candidate) |