lkml.org 
[lkml]   [2015]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 42/65] bridge: multicast: restore router configuration on port link down/up
    Date
    From: Satish Ashok <sashok@cumulusnetworks.com>

    3.4.110-rc1 review patch. If anyone has any objections, please let me know.

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


    commit 754bc547f0a79f7568b5b81c7fc0a8d044a6571a upstream.

    When a port goes through a link down/up the multicast router configuration
    is not restored.

    Signed-off-by: Satish Ashok <sashok@cumulusnetworks.com>
    Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
    Fixes: 0909e11758bd ("bridge: Add multicast_router sysfs entries")
    Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    [lizf: Backported to 3.4: adjust context]
    Signed-off-by: Zefan Li <lizefan@huawei.com>
    ---
    net/bridge/br_multicast.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
    index a41051a..87ae8c3 100644
    --- a/net/bridge/br_multicast.c
    +++ b/net/bridge/br_multicast.c
    @@ -36,6 +36,9 @@
    #define mlock_dereference(X, br) \
    rcu_dereference_protected(X, lockdep_is_held(&br->multicast_lock))

    +static void br_multicast_add_router(struct net_bridge *br,
    + struct net_bridge_port *port);
    +
    #if IS_ENABLED(CONFIG_IPV6)
    static inline int ipv6_is_transient_multicast(const struct in6_addr *addr)
    {
    @@ -842,6 +845,8 @@ void br_multicast_enable_port(struct net_bridge_port *port)
    goto out;

    __br_multicast_enable_port(port);
    + if (port->multicast_router == 2 && hlist_unhashed(&port->rlist))
    + br_multicast_add_router(br, port);

    out:
    spin_unlock(&br->multicast_lock);
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-10-20 03:01    [W:4.838 / U:0.488 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site