--- zzzz-none-000/linux-4.9.279/net/bridge/br_mdb.c	2021-08-08 06:38:54.000000000 +0000
+++ puma7-atom-6591-750/linux-4.9.279/net/bridge/br_mdb.c	2023-02-08 11:43:43.000000000 +0000
@@ -532,7 +532,7 @@
 			break;
 	}
 
-	p = br_multicast_new_port_group(port, group, *pp, state);
+	p = br_multicast_new_port_group(port, group, *pp, state, NULL);
 	if (unlikely(!p))
 		return -ENOMEM;
 	rcu_assign_pointer(*pp, p);
@@ -647,9 +647,7 @@
 
 		__mdb_entry_fill_flags(entry, p->flags);
 		rcu_assign_pointer(*pp, p->next);
-		hlist_del_init(&p->mglist);
-		del_timer(&p->timer);
-		call_rcu_bh(&p->rcu, br_multicast_free_pg);
+		br_multicast_delete_pg(p);
 		err = 0;
 
 		if (!mp->ports && !mp->mglist &&