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

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

bridge: mdb: start delete timer for temp static entries 



Start the delete timer when adding temp static entries so they can expire.

Signed-off-by: default avatarSatish Ashok <sashok@cumulusnetworks.com>
Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Fixes: ccb1c31a ("bridge: add flags to distinguish permanent mdb entires")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cfa52005

net/bridge/br_mdb.c

+3 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port, 
	struct net_bridge_port_group *p;

	struct net_bridge_port_group __rcu **pp;

	struct net_bridge_mdb_htable *mdb;

	unsigned long now = jiffies;

	int err;



	mdb = mlock_dereference(br->mdb, br);
@@ -347,6 +348,8 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port, 
	if (unlikely(!p))

		return -ENOMEM;

	rcu_assign_pointer(*pp, p);

	if (state == MDB_TEMPORARY)

		mod_timer(&p->timer, now + br->multicast_membership_interval);



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

	return 0;