From ac56260d45336c3969e17c85a812c68ae91da0fc Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 27 Apr 2010 16:26:49 -0700
Subject: [PATCH] --- yaml --- r: 194566 b: refs/heads/master c:
 ff65e8275f6c96a5eda57493bd84c4555decf7b3 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/net/bridge/br_multicast.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9c5dbb5c4462..25261fa6b136 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87b6cf51acb4999fff7e6841986874b108679cb4
+refs/heads/master: ff65e8275f6c96a5eda57493bd84c4555decf7b3
diff --git a/trunk/net/bridge/br_multicast.c b/trunk/net/bridge/br_multicast.c
index fcba313f1894..e29c9b738796 100644
--- a/trunk/net/bridge/br_multicast.c
+++ b/trunk/net/bridge/br_multicast.c
@@ -1045,7 +1045,7 @@ static void br_multicast_add_router(struct net_bridge *br,
 	struct net_bridge_port *p;
 	struct hlist_node *n, *last = NULL;
 
-	hlist_for_each_entry(p, n, &br->router_list, rlist) {
+	hlist_for_each_entry_rcu(p, n, &br->router_list, rlist) {
 		if ((unsigned long) port >= (unsigned long) p) {
 			hlist_add_before_rcu(n, &port->rlist);
 			return;