1 files changed, 6 insertions, 5 deletions

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 7110779a0244..e00767e8ebd9 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -877,7 +877,7 @@ static int arp_process(struct sk_buff *skb)
 
         n = __neigh_lookup(&arp_tbl, &sip, dev, 0);
 
-        if (ipv4_devconf.arp_accept) {
+        if (IPV4_DEVCONF_ALL(ARP_ACCEPT)) {
                 /* Unsolicited ARP is not accepted by default.
                    It is possible, that this option should be enabled for some
                    devices (strip is candidate)
@@ -987,11 +987,11 @@ static int arp_req_set(struct arpreq *r, struct net_device * dev)
                         return 0;
                 }
                 if (dev == NULL) {
-                        ipv4_devconf.proxy_arp = 1;
+                        IPV4_DEVCONF_ALL(PROXY_ARP) = 1;
                         return 0;
                 }
                 if (__in_dev_get_rtnl(dev)) {
-                        __in_dev_get_rtnl(dev)->cnf.proxy_arp = 1;
+                        IN_DEV_CONF_SET(__in_dev_get_rtnl(dev), PROXY_ARP, 1);
                         return 0;
                 }
                 return -ENXIO;
@@ -1093,11 +1093,12 @@ static int arp_req_delete(struct arpreq *r, struct net_device * dev)
                         return pneigh_delete(&arp_tbl, &ip, dev);
                 if (mask == 0) {
                         if (dev == NULL) {
-                                ipv4_devconf.proxy_arp = 0;
+                                IPV4_DEVCONF_ALL(PROXY_ARP) = 0;
                                 return 0;
                         }
                         if (__in_dev_get_rtnl(dev)) {
-                                __in_dev_get_rtnl(dev)->cnf.proxy_arp = 0;
+                                IN_DEV_CONF_SET(__in_dev_get_rtnl(dev),
+                                                PROXY_ARP, 0);
                                 return 0;
                         }
                         return -ENXIO;