diff options
| author | Satish Ashok <sashok@cumulusnetworks.com> | 2015-06-19 01:22:57 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-12 16:33:16 +0200 |
| commit | 0b608389d6fb378bd173a38e5e11846418691275 (patch) | |
| tree | 0e958a761c0e1682245ee56ccc5aec29b628dd36 /net | |
| parent | 8bbe4f448c01949084ef404eded3622086f052a6 (diff) | |
| download | kernel_samsung_smdk4412-0b608389d6fb378bd173a38e5e11846418691275.zip kernel_samsung_smdk4412-0b608389d6fb378bd173a38e5e11846418691275.tar.gz kernel_samsung_smdk4412-0b608389d6fb378bd173a38e5e11846418691275.tar.bz2 | |
bridge: multicast: restore router configuration on port link down/up
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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_multicast.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 1bd197f..5f21e53 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 defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) 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); |