diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-27 19:49:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-27 19:49:58 -0400 |
commit | 709b9326ef6fc1b7e379d47d5f39ebc27dad3f4d (patch) | |
tree | 5f0355d2f858d641317f856f8a369bc0f54c59af | |
parent | 2a1f8794161d9d5d46881160279df62767197526 (diff) |
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>
-rw-r--r-- | net/bridge/br_multicast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index e29c9b738796..fcba313f1894 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, | |||
1045 | struct net_bridge_port *p; | 1045 | struct net_bridge_port *p; |
1046 | struct hlist_node *n, *last = NULL; | 1046 | struct hlist_node *n, *last = NULL; |
1047 | 1047 | ||
1048 | hlist_for_each_entry_rcu(p, n, &br->router_list, rlist) { | 1048 | hlist_for_each_entry(p, n, &br->router_list, rlist) { |
1049 | if ((unsigned long) port >= (unsigned long) p) { | 1049 | if ((unsigned long) port >= (unsigned long) p) { |
1050 | hlist_add_before_rcu(n, &port->rlist); | 1050 | hlist_add_before_rcu(n, &port->rlist); |
1051 | return; | 1051 | return; |