net: bridge: multicast: handle block pg delete for all cases

A block report can result in empty source and host sets for both include
and exclude groups so if there are no hosts left we can safely remove
the group. Pull the block group handling so it can cover both cases and
add a check if EHT requires the delete.

Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 9cfc004312aba27d467fcf3b5a138fb720d2ac23..47afb1e11daf35b1cf5a7b3e9699ccad793bda2c 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -2210,14 +2210,6 @@ static bool __grp_src_block_incl(struct net_bridge_port_group *pg, void *h_addr,
        if (to_send)
                __grp_src_query_marked_and_rexmit(pg);
 
-       if (pg->filter_mode == MCAST_INCLUDE && hlist_empty(&pg->src_list)) {
-               br_multicast_find_del_pg(pg->key.port->br, pg);
-               /* a notification has already been sent and we shouldn't access
-                * pg after the delete thus we have to return false
-                */
-               changed = false;
-       }
-
        return changed;
 }
 
@@ -2279,6 +2271,15 @@ static bool br_multicast_block(struct net_bridge_port_group *pg, void *h_addr,
                break;
        }
 
+       if ((pg->filter_mode == MCAST_INCLUDE && hlist_empty(&pg->src_list)) ||
+           br_multicast_eht_should_del_pg(pg)) {
+               br_multicast_find_del_pg(pg->key.port->br, pg);
+               /* a notification has already been sent and we shouldn't
+                * access pg after the delete so we have to return false
+                */
+               changed = false;
+       }
+
        return changed;
 }