diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-11-15 07:38:10 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-15 20:13:16 +0100 |
| commit | e80516880019aa1f7c5c410276edfea9575ec89f (patch) | |
| tree | b17f51f56ef97e5a366f2f5bc3020935d8eb5def /net/bridge/br_forward.c | |
| parent | net/ipv6/mcast.c: Remove unnecessary semicolons (diff) | |
| download | linux-e80516880019aa1f7c5c410276edfea9575ec89f.tar.xz linux-e80516880019aa1f7c5c410276edfea9575ec89f.zip | |
bridge: add RCU annotation to bridge multicast table
Add modern __rcu annotatations to bridge multicast table.
Use newer hlist macros to avoid direct access to hlist internals.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_forward.c')
| -rw-r--r-- | net/bridge/br_forward.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index cbfe87f0f34a..2bd11ec6d166 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -223,7 +223,7 @@ static void br_multicast_flood(struct net_bridge_mdb_entry *mdst, struct net_bridge_port_group *p; struct hlist_node *rp; - rp = rcu_dereference(br->router_list.first); + rp = rcu_dereference(hlist_first_rcu(&br->router_list)); p = mdst ? rcu_dereference(mdst->ports) : NULL; while (p || rp) { struct net_bridge_port *port, *lport, *rport; @@ -242,7 +242,7 @@ static void br_multicast_flood(struct net_bridge_mdb_entry *mdst, if ((unsigned long)lport >= (unsigned long)port) p = rcu_dereference(p->next); if ((unsigned long)rport >= (unsigned long)port) - rp = rcu_dereference(rp->next); + rp = rcu_dereference(hlist_next_rcu(rp)); } if (!prev) |