diff options
| author |   Satish Ashok <sashok@cumulusnetworks.com> | 2015-07-06 05:53:35 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-07-08 14:52:58 -0700 |
| commit | f7e2965db17dd3b60f05fad88e7afc79ea75b48f (patch) | |
| tree | 6fbf61cba158420e1ec884443ba547ff12382185 /net/bridge | |
| parent | net: phy: add dependency on HAS_IOMEM to MDIO_BUS_MUX_MMIOREG (diff) | |
| download | linux-dev-f7e2965db17dd3b60f05fad88e7afc79ea75b48f.tar.xz linux-dev-f7e2965db17dd3b60f05fad88e7afc79ea75b48f.zip | |
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: Satish Ashok <sashok@cumulusnetworks.com>
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Fixes: ccb1c31a7a87 ("bridge: add flags to distinguish permanent mdb entires")
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_mdb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index e29ad70b3000..3bfc675cf0d1 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -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; |