1 files changed, 4 insertions, 0 deletions

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index bc2b1badab88..b6a3872f5681 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -147,6 +147,8 @@ static void del_nbp(struct net_bridge_port *p)
 
         rcu_assign_pointer(dev->br_port, NULL);
 
+        br_multicast_del_port(p);
+
         kobject_uevent(&p->kobj, KOBJ_REMOVE);
         kobject_del(&p->kobj);
 
@@ -207,6 +209,7 @@ static struct net_device *new_bridge_dev(struct net *net, const char *name)
         br_netfilter_rtable_init(br);
 
         br_stp_timer_init(br);
+        br_multicast_init(br);
 
         return dev;
 }
@@ -258,6 +261,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,
         br_init_port(p);
         p->state = BR_STATE_DISABLED;
         br_stp_port_timer_init(p);
+        br_multicast_add_port(p);
 
         return p;
 }