From 128f7e077d85a6c2f06102586574753eafc35319 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Mon, 14 Jan 2008 23:06:19 -0800
Subject: [PATCH] --- yaml --- r: 78803 b: refs/heads/master c:
 39a6d06300128d32f361f4f790beba0ca83730eb h: refs/heads/master i:   78801:
 ef8af44c3f12b5acb58720f1773d67810471b9f0   78799:
 bf9f64743de4b9551017d690744b0b462697c0a0 v: v3

---
 [refs]                   | 2 +-
 trunk/net/ipv4/arp.c     | 1 -
 trunk/net/ipv4/devinet.c | 6 ++++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f6f743ac4b78..7fa149a01127 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bd85e32644d4d3744117b0a196ad4382f8acf35
+refs/heads/master: 39a6d06300128d32f361f4f790beba0ca83730eb
diff --git a/trunk/net/ipv4/arp.c b/trunk/net/ipv4/arp.c
index 6f0827b2b154..b2c19cb12063 100644
--- a/trunk/net/ipv4/arp.c
+++ b/trunk/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/trunk/net/ipv4/devinet.c b/trunk/net/ipv4/devinet.c
index dc1665a2b075..e381edb19b23 100644
--- a/trunk/net/ipv4/devinet.c
+++ b/trunk/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)