From 914cc8f488ad26bc3fa5f06636a1af59d590c530 Mon Sep 17 00:00:00 2001
From: "Jorge Boncompte [DTI2]" <jorge@dti2.net>
Date: Fri, 25 Nov 2011 13:24:49 -0500
Subject: [PATCH] --- yaml --- r: 276229 b: refs/heads/master c:
 df07a94cf50eb73d09bf2350c3fe2598e4cbeee1 h: refs/heads/master i:   276227:
 9003d34399ede1bab79456b953c6111729a7c5ac v: v3

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

diff --git a/[refs] b/[refs]
index 8547fd960a16..26bba89f35d3 100644
--- 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
index 039d51e6c284..5ac07d31fbc9 100644
--- 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;