Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / net / bridge / br_stp_if.c

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 9a52ac5b452557ad945aa69e79ed3e86aecd21ef..d527119e9f54fd0d226a60c8f20e669ab506c55c 100644 (file)
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -108,6 +108,7 @@ void br_stp_disable_port(struct net_bridge_port *p)
        del_timer(&p->hold_timer);
 
        br_fdb_delete_by_port(br, p, 0);
+       br_multicast_disable_port(p);
 
        br_configuration_update(br);