diff options
| author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-06-19 10:45:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-23 12:29:54 +0200 |
| commit | 7ce42de1895d4787b47b004638d642dcacb464fe (patch) | |
| tree | ab4b5db369fe94a6f8c4c93632db7dfc3374f6c9 /net/bridge | |
| parent | Merge tag 'nfc-next-4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s... (diff) | |
| download | linux-7ce42de1895d4787b47b004638d642dcacb464fe.tar.xz linux-7ce42de1895d4787b47b004638d642dcacb464fe.zip | |
bridge: multicast: start querier timer when running user-space stp
When STP is running in user-space and querier is configured, the
querier timer is not started when a port goes to a non-blocking state.
This patch unifies the user- and kernel-space stp multicast port enable
path and enables it in all states different from blocking. Note that when a
port goes in BR_STATE_DISABLED it's not enabled because that is handled
in the beginning of the port list loop.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_stp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index 45f1ff113af9..e7ab74b405a1 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -428,7 +428,6 @@ static void br_make_forwarding(struct net_bridge_port *p) else br_set_state(p, BR_STATE_LEARNING); - br_multicast_enable_port(p); br_log_state(p); br_ifinfo_notify(RTM_NEWLINK, p); @@ -462,6 +461,8 @@ void br_port_state_selection(struct net_bridge *br) } } + if (p->state != BR_STATE_BLOCKING) + br_multicast_enable_port(p); if (p->state == BR_STATE_FORWARDING) ++liveports; } |