From d69be3ea2ab7d6e6b84119bbdc2e3442a03b4b07 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Thu, 28 Feb 2008 20:48:25 -0800
Subject: [PATCH] --- yaml --- r: 89793 b: refs/heads/master c:
 0c65babd6ce758dd06330b3d9d677b7624f9e3fa h: refs/heads/master i:   89791:
 c8b47ee52c78b44d55dd0ecb2e170916aab2299d v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/neighbour.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 66a91dbfa3f6..807f1d30cfe0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ab438fcd7373da9e559576e418e890b7cfd94f4
+refs/heads/master: 0c65babd6ce758dd06330b3d9d677b7624f9e3fa
diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
index be8b264b29bf..31b6567f0b6a 100644
--- a/trunk/net/core/neighbour.c
+++ b/trunk/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;
 	}