bridge: multicast: add a comment to br_port_state_selection about blocking state
authorNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Tue, 23 Jun 2015 11:47:44 +0000 (04:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 Jun 2015 12:40:54 +0000 (05:40 -0700)
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>
net/bridge/br_stp.c

index e7ab74b405a145236762cf3a78dc49d48e5b1e1d..b4b6dab9c2859730d3ba9b5bc17f8302ddca6510 100644 (file)
@@ -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;
        }