lkml.org 
[lkml]   [2015]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 46/53] bridge: mdb: start delete timer for temp static entries
    Date
    3.13.11-ckt25 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Satish Ashok <sashok@cumulusnetworks.com>

    commit f7e2965db17dd3b60f05fad88e7afc79ea75b48f upstream.

    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>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    net/bridge/br_mdb.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
    index b734575..7d89514 100644
    --- a/net/bridge/br_mdb.c
    +++ b/net/bridge/br_mdb.c
    @@ -322,6 +322,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);
    @@ -346,6 +347,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;
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-08-06 23:01    [W:4.027 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site