---

yaml --- r: 89793 b: refs/heads/master c: 0c65bab h: refs/heads/master i: 89791: c8b47ee v: v3
git-mirror · Feb 29, 2008 · d69be3e · d69be3e
1 parent b0bc7ad
commit d69be3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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;
 	}