diff options
| author |   Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-06-23 04:47:44 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-06-24 05:40:54 -0700 |
| commit | 9aa66382163e784acac0ce3580ed202d9a56d1ac (patch) | |
| tree | 3ca372a055a5fc1c26991d3dce2abeaae815f36c /net/bridge/br_stp.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-9aa66382163e784acac0ce3580ed202d9a56d1ac.tar.xz linux-dev-9aa66382163e784acac0ce3580ed202d9a56d1ac.zip | |
bridge: multicast: add a comment to br_port_state_selection about blocking state
Add a comment to explain why we're not disabling port's multicast when it
goes in blocking state. Since there's a check in the timer's function which
bypasses the timer if the port's in blocking/disabled state, the timer will
simply expire and stop without sending more queries.
Suggested-by: Herbert Xu <herbert@gondor.apana.org.au>
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/br_stp.c')
| -rw-r--r-- | net/bridge/br_stp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index e7ab74b405a1..b4b6dab9c285 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -463,6 +463,10 @@ void br_port_state_selection(struct net_bridge *br) if (p->state != BR_STATE_BLOCKING) br_multicast_enable_port(p); + /* Multicast is not disabled for the port when it goes in + * blocking state because the timers will expire and stop by + * themselves without sending more queries. + */ if (p->state == BR_STATE_FORWARDING) ++liveports; } |