diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-12-16 21:32:48 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 22:58:12 (GMT) |
| commit | 586f12115264b767ea6a48ce081ca25a39c1e3dd (patch) | |
| tree | 48bb41f07d4dc2a1e0d9f9d71286594d3b9800fa /net/ipv4/arp.c | |
| parent | 9355bbd685bf705a7f7bd6470b92ca0562c7a661 (diff) | |
| download | linux-586f12115264b767ea6a48ce081ca25a39c1e3dd.tar.xz | |
[IPV4]: Switch users of ipv4_devconf(_all) to use the pernet one
These are scattered over the code, but almost all the
"critical" places already have the proper struct net
at hand except for snmp proc showing function and routing
rtnl handler.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/arp.c')
| -rw-r--r-- | net/ipv4/arp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index 5daf504..1102fb3 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -860,7 +860,7 @@ static int arp_process(struct sk_buff *skb) n = __neigh_lookup(&arp_tbl, &sip, dev, 0); - if (IPV4_DEVCONF_ALL(ARP_ACCEPT)) { + if (IPV4_DEVCONF_ALL(dev->nd_net, ARP_ACCEPT)) { /* Unsolicited ARP is not accepted by default. It is possible, that this option should be enabled for some devices (strip is candidate) @@ -955,7 +955,7 @@ out_of_mem: static int arp_req_set_proxy(struct net *net, struct net_device *dev, int on) { if (dev == NULL) { - IPV4_DEVCONF_ALL(PROXY_ARP) = on; + IPV4_DEVCONF_ALL(net, PROXY_ARP) = on; return 0; } if (__in_dev_get_rtnl(dev)) { |