|
@@ -208,17 +208,15 @@ static void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
|
|
|
{
|
|
|
struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
|
|
|
struct net_bridge *br = netdev_priv(dev);
|
|
|
- struct net_bridge_port *port;
|
|
|
- struct net_bridge_port *lport, *rport;
|
|
|
- struct net_bridge_port *prev;
|
|
|
+ struct net_bridge_port *prev = NULL;
|
|
|
struct net_bridge_port_group *p;
|
|
|
struct hlist_node *rp;
|
|
|
|
|
|
- prev = NULL;
|
|
|
-
|
|
|
rp = rcu_dereference(br->router_list.first);
|
|
|
p = mdst ? rcu_dereference(mdst->ports) : NULL;
|
|
|
while (p || rp) {
|
|
|
+ struct net_bridge_port *port, *lport, *rport;
|
|
|
+
|
|
|
lport = p ? p->port : NULL;
|
|
|
rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
|
|
|
NULL;
|