aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-04-27 16:49:58 -0700
committerDavid S. Miller <davem@davemloft.net>2010-04-27 16:49:58 -0700
commit709b9326ef6fc1b7e379d47d5f39ebc27dad3f4d (patch)
tree5f0355d2f858d641317f856f8a369bc0f54c59af /net/bridge
parent2a1f8794161d9d5d46881160279df62767197526 (diff)
downloadkernel_samsung_aries-709b9326ef6fc1b7e379d47d5f39ebc27dad3f4d.zip
kernel_samsung_aries-709b9326ef6fc1b7e379d47d5f39ebc27dad3f4d.tar.gz
kernel_samsung_aries-709b9326ef6fc1b7e379d47d5f39ebc27dad3f4d.tar.bz2
Revert "bridge: Use hlist_for_each_entry_rcu() in br_multicast_add_router()"
This reverts commit ff65e8275f6c96a5eda57493bd84c4555decf7b3. As explained by Stephen Hemminger, the traversal doesn't require RCU handling as we hold a lock. The list addition et al. calls, on the other hand, do. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_multicast.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index e29c9b7..fcba313 100644
--- a/net/bridge/br_multicast.c
+++ b/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_rcu(p, n, &br->router_list, rlist) {
+ hlist_for_each_entry(p, n, &br->router_list, rlist) {
if ((unsigned long) port >= (unsigned long) p) {
hlist_add_before_rcu(n, &port->rlist);
return;