From: Denis V. Lunev <den@openvz.org>
Date: Fri, 29 Feb 2008 04:48:25 +0000 (-0800)
Subject: [NETNS]: Default arp parameters lookup.
X-Git-Tag: v2.6.26-rc1~1138^2~567
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0c65babd6ce758dd06330b3d9d677b7624f9e3fa;p=linux-2.6-omap-h63xx.git

[NETNS]: Default arp parameters lookup.

Default ARP parameters should be findable regardless of the context.
Required to make inetdev_event working.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index be8b264b29b..31b6567f0b6 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1284,9 +1284,7 @@ static inline struct neigh_parms *lookup_neigh_params(struct neigh_table *tbl,
 	struct neigh_parms *p;
 
 	for (p = &tbl->parms; p; p = p->next) {
-		if (p->net != net)
-			continue;
-		if ((p->dev && p->dev->ifindex == ifindex) ||
+		if ((p->dev && p->dev->ifindex == ifindex && p->net == net) ||
 		    (!p->dev && !ifindex))
 			return p;
 	}