From: Nikolay Aleksandrov Date: Tue, 23 Jun 2015 11:47:44 +0000 (-0700) Subject: bridge: multicast: add a comment to br_port_state_selection about blocking state X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9aa66382163e784acac0ce3580ed202d9a56d1ac;p=linux-beck.git 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 Signed-off-by: Nikolay Aleksandrov Acked-by: Herbert Xu Signed-off-by: David S. Miller --- 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; }