Merge branch 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / net / bridge / br_stp.c

diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index fd3f8d6c0998adaa1c3c64f506c72ec8bae9b7b6..edcf14b560f6febf68a814418999cbe63ee6dcfd 100644 (file)
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -386,6 +386,8 @@ static void br_make_forwarding(struct net_bridge_port *p)
        else
                p->state = BR_STATE_LEARNING;
 
+       br_multicast_enable_port(p);
+
        br_log_state(p);
 
        if (br->forward_delay != 0)