2 files changed, 4 insertions, 3 deletions

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 6f0827b2b154..b2c19cb12063 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -402,7 +402,6 @@ static int arp_ignore(struct in_device *in_dev, __be32 sip, __be32 tip)
         case 3: /* Do not reply for scope host addresses */
                 sip = 0;
                 scope = RT_SCOPE_LINK;
-                in_dev = NULL;
                 break;
         case 4: /* Reserved */
         case 5:
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index dc1665a2b075..e381edb19b23 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -978,13 +978,15 @@ __be32 inet_confirm_addr(struct in_device *in_dev,
 {
         __be32 addr = 0;
         struct net_device *dev;
+        struct net *net;
 
-        if (in_dev != NULL)
+        if (scope != RT_SCOPE_LINK)
                 return confirm_addr_indev(in_dev, dst, local, scope);
 
+        net = in_dev->dev->nd_net;
         read_lock(&dev_base_lock);
         rcu_read_lock();
-        for_each_netdev(&init_net, dev) {
+        for_each_netdev(net, dev) {
                 if ((in_dev = __in_dev_get_rcu(dev))) {
                         addr = confirm_addr_indev(in_dev, dst, local, scope);
                         if (addr)