Merge tag 'mac80211-next-for-net-next-2021-01-27' of git://git.kernel.org/pub/scm...

[linux-2.6-microblaze.git] / net / bridge / br_private.h

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index d62c6e1..d242ba6 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -252,6 +252,8 @@ struct net_bridge_port_group {
        struct timer_list               timer;
        struct timer_list               rexmit_timer;
        struct hlist_node               mglist;
+       struct rb_root                  eht_set_tree;
+       struct rb_root                  eht_host_tree;
 
        struct rhash_head               rhnode;
        struct net_bridge_mcast_gc      mcast_gc;
@@ -308,6 +310,8 @@ struct net_bridge_port {
 #if IS_ENABLED(CONFIG_IPV6)
        struct bridge_mcast_own_query   ip6_own_query;
 #endif /* IS_ENABLED(CONFIG_IPV6) */
+       u32                             multicast_eht_hosts_limit;
+       u32                             multicast_eht_hosts_cnt;
        unsigned char                   multicast_router;
        struct bridge_mcast_stats       __percpu *mcast_stats;
        struct timer_list               multicast_router_timer;
@@ -846,6 +850,10 @@ void br_multicast_star_g_handle_mode(struct net_bridge_port_group *pg,
                                     u8 filter_mode);
 void br_multicast_sg_add_exclude_ports(struct net_bridge_mdb_entry *star_mp,
                                       struct net_bridge_port_group *sg);
+struct net_bridge_group_src *
+br_multicast_find_group_src(struct net_bridge_port_group *pg, struct br_ip *ip);
+void br_multicast_del_group_src(struct net_bridge_group_src *src,
+                               bool fastleave);
 
 static inline bool br_group_is_l2(const struct br_ip *group)
 {