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

Commit 5b1d0d8f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bridge-temp-and-perm' 



Nikolay Aleksandrov says:

====================
bridge: multicast: temp and perm entries behaviour enhancements

Patch 01 adds a notify when a group is deleted via br_multicast_del_pg()
(on expire, on device delete or on device down).
Patch 02 changes how bridge device and bridge port delete and down/up are
handled. Until now on bridge down all groups were flushed, now only the
temp ones are (same for port), perm entries are flushed only on port or
bridge removal.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 03b6dc7d e10177ab

net/bridge/br_if.c

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ void br_dev_delete(struct net_device *dev, struct list_head *head) 
	br_fdb_delete_by_port(br, NULL, 0, 1);



	br_vlan_flush(br);

	br_multicast_dev_del(br);

	del_timer_sync(&br->gc_timer);



	br_sysfs_delbr(br->dev);

net/bridge/br_multicast.c

+22 −7
Original line number Diff line number Diff line
@@ -273,6 +273,8 @@ static void br_multicast_del_pg(struct net_bridge *br, 
		rcu_assign_pointer(*pp, p->next);

		hlist_del_init(&p->mglist);

		del_timer(&p->timer);

		br_mdb_notify(br->dev, p->port, &pg->addr, RTM_DELMDB,

			      p->state);

		call_rcu_bh(&p->rcu, br_multicast_free_pg);



		if (!mp->ports && !mp->mglist &&
@@ -914,6 +916,15 @@ void br_multicast_add_port(struct net_bridge_port *port) 


void br_multicast_del_port(struct net_bridge_port *port)

{

	struct net_bridge *br = port->br;

	struct net_bridge_port_group *pg;

	struct hlist_node *n;



	/* Take care of the remaining groups, only perm ones should be left */

	spin_lock_bh(&br->multicast_lock);

	hlist_for_each_entry_safe(pg, n, &port->mglist, mglist)

		br_multicast_del_pg(br, pg);

	spin_unlock_bh(&br->multicast_lock);

	del_timer_sync(&port->multicast_router_timer);

}
@@ -953,6 +964,7 @@ void br_multicast_disable_port(struct net_bridge_port *port) 


	spin_lock(&br->multicast_lock);

	hlist_for_each_entry_safe(pg, n, &port->mglist, mglist)

		if (pg->state == MDB_TEMPORARY)

			br_multicast_del_pg(br, pg);



	if (!hlist_unhashed(&port->rlist))
@@ -1730,12 +1742,6 @@ void br_multicast_open(struct net_bridge *br) 


void br_multicast_stop(struct net_bridge *br)

{

	struct net_bridge_mdb_htable *mdb;

	struct net_bridge_mdb_entry *mp;

	struct hlist_node *n;

	u32 ver;

	int i;



	del_timer_sync(&br->multicast_router_timer);

	del_timer_sync(&br->ip4_other_query.timer);

	del_timer_sync(&br->ip4_own_query.timer);
@@ -1743,6 +1749,15 @@ void br_multicast_stop(struct net_bridge *br) 
	del_timer_sync(&br->ip6_other_query.timer);

	del_timer_sync(&br->ip6_own_query.timer);

#endif

}



void br_multicast_dev_del(struct net_bridge *br)

{

	struct net_bridge_mdb_htable *mdb;

	struct net_bridge_mdb_entry *mp;

	struct hlist_node *n;

	u32 ver;

	int i;



	spin_lock_bh(&br->multicast_lock);

	mdb = mlock_dereference(br->mdb, br);

net/bridge/br_private.h

+1 −0
Original line number Diff line number Diff line
@@ -466,6 +466,7 @@ void br_multicast_disable_port(struct net_bridge_port *port); 
void br_multicast_init(struct net_bridge *br);

void br_multicast_open(struct net_bridge *br);

void br_multicast_stop(struct net_bridge *br);

void br_multicast_dev_del(struct net_bridge *br);

void br_multicast_deliver(struct net_bridge_mdb_entry *mdst,

			  struct sk_buff *skb);

void br_multicast_forward(struct net_bridge_mdb_entry *mdst,