---

yaml --- r: 276229 b: refs/heads/master c: df07a94 h: refs/heads/master i: 276227: 9003d34 v: v3
git-mirror · Nov 25, 2011 · 914cc8f · 914cc8f
1 parent 8b2ee27
commit 914cc8f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42ca0203fd59aa9be7b241be1fbc3bef1f903f9c
+refs/heads/master: df07a94cf50eb73d09bf2350c3fe2598e4cbeee1
diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
@@ -2397,7 +2397,10 @@ static struct pneigh_entry *pneigh_get_next(struct seq_file *seq,
 	struct net *net = seq_file_net(seq);
 	struct neigh_table *tbl = state->tbl;
 
-	pn = pn->next;
+	do {
+		pn = pn->next;
+	} while (pn && !net_eq(pneigh_net(pn), net));
+
 	while (!pn) {
 		if (++state->bucket > PNEIGH_HASHMASK)
 			break;