diff options
| author | Linus Lüssing <linus.luessing@c0d3.blue> | 2021-05-13 15:20:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-05-13 14:04:31 -0700 |
| commit | ce6f709775bdf9bc8dd852a8758e10a98f31f280 (patch) | |
| tree | ce7cf9754efe93ef0ce318b59a469c1cba9f4839 /net/bridge/br_forward.c | |
| parent | 8380c81d5c4fced6f4397795a5ae65758272bbfd (diff) | |
net: bridge: mcast: rename multicast router lists and timers
In preparation for the upcoming split of multicast router state into
their IPv4 and IPv6 variants, rename the affected variable to the IPv4
version first to avoid some renames in later commits.
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
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 6e9b049ae521..eb9847ad40cf 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -276,7 +276,7 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst, bool allow_mode_include = true; struct hlist_node *rp; - rp = rcu_dereference(hlist_first_rcu(&br->router_list)); + rp = rcu_dereference(hlist_first_rcu(&br->ip4_mc_router_list)); if (mdst) { p = rcu_dereference(mdst->ports); if (br_multicast_should_handle_mode(br, mdst->addr.proto) && @@ -290,7 +290,7 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst, struct net_bridge_port *port, *lport, *rport; lport = p ? p->key.port : NULL; - rport = hlist_entry_safe(rp, struct net_bridge_port, rlist); + rport = hlist_entry_safe(rp, struct net_bridge_port, ip4_rlist); if ((unsigned long)lport > (unsigned long)rport) { port = lport; |