Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 544586f7 authored by Satish Ashok's avatar Satish Ashok Committed by David S. Miller
Browse files

bridge: mcast: give fast leave precedence over multicast router and querier 



When fast leave is configured on a bridge port and an IGMP leave is
received for a group, the group is not deleted immediately if there is
a router detected or if multicast querier is configured.
Ideally the group should be deleted immediately when fast leave is
configured.

Signed-off-by: default avatarSatish Ashok <sashok@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent df356d5e

net/bridge/br_multicast.c

+26 −24
Original line number Diff line number Diff line
@@ -1416,8 +1416,7 @@ br_multicast_leave_group(struct net_bridge *br, 


	spin_lock(&br->multicast_lock);

	if (!netif_running(br->dev) ||

	    (port && port->state == BR_STATE_DISABLED) ||

	    timer_pending(&other_query->timer))

	    (port && port->state == BR_STATE_DISABLED))

		goto out;



	mdb = mlock_dereference(br->mdb, br);
@@ -1425,6 +1424,31 @@ br_multicast_leave_group(struct net_bridge *br, 
	if (!mp)

		goto out;



	if (port && (port->flags & BR_MULTICAST_FAST_LEAVE)) {

		struct net_bridge_port_group __rcu **pp;



		for (pp = &mp->ports;

		     (p = mlock_dereference(*pp, br)) != NULL;

		     pp = &p->next) {

			if (p->port != port)

				continue;



			rcu_assign_pointer(*pp, p->next);

			hlist_del_init(&p->mglist);

			del_timer(&p->timer);

			call_rcu_bh(&p->rcu, br_multicast_free_pg);

			br_mdb_notify(br->dev, port, group, RTM_DELMDB);



			if (!mp->ports && !mp->mglist &&

			    netif_running(br->dev))

				mod_timer(&mp->timer, jiffies);

		}

		goto out;

	}



	if (timer_pending(&other_query->timer))

		goto out;



	if (br->multicast_querier) {

		__br_multicast_send_query(br, port, &mp->addr);
@@ -1450,28 +1474,6 @@ br_multicast_leave_group(struct net_bridge *br, 
		}

	}



	if (port && (port->flags & BR_MULTICAST_FAST_LEAVE)) {

		struct net_bridge_port_group __rcu **pp;



		for (pp = &mp->ports;

		     (p = mlock_dereference(*pp, br)) != NULL;

		     pp = &p->next) {

			if (p->port != port)

				continue;



			rcu_assign_pointer(*pp, p->next);

			hlist_del_init(&p->mglist);

			del_timer(&p->timer);

			call_rcu_bh(&p->rcu, br_multicast_free_pg);

			br_mdb_notify(br->dev, port, group, RTM_DELMDB);



			if (!mp->ports && !mp->mglist &&

			    netif_running(br->dev))

				mod_timer(&mp->timer, jiffies);

		}

		goto out;

	}



	now = jiffies;

	time = now + br->multicast_last_member_count *

		     br->multicast_last_member_interval;