| Message ID | 1435060064-32761-1-git-send-email-nikolay@cumulusnetworks.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Jun 23, 2015 at 04:47:44AM -0700, Nikolay Aleksandrov wrote: > 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> Thanks,
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; }
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> --- net/bridge/br_stp.c | 4 ++++ 1 file changed, 4 insertions(+)