On Thu, May 13, 2021 at 03:20:47PM +0200, Linus Lüssing wrote:

In preparation for the upcoming split of multicast router state into
their IPv4 and IPv6 variants make br_multicast_is_router() protocol
family aware.

Note that for now br_ip6_multicast_is_router() uses the currently still
common ip4_mc_router_timer for now. It will be renamed to
ip6_mc_router_timer later when the split is performed.

While at it also renames the "1" and "2" constants in
br_multicast_is_router() to the MDB_RTR_TYPE_TEMP_QUERY and
MDB_RTR_TYPE_PERM enums.

Signed-off-by: Linus Lüssing <redacted>

Just in case this hasn't been reported yet. In next-20210514:

$ git grep br_multicast_is_router
net/bridge/br_input.c:                      br_multicast_is_router(br, skb)) {
net/bridge/br_multicast.c:      is_router = br_multicast_is_router(br, NULL);
net/bridge/br_private.h:br_multicast_is_router(struct net_bridge *br, struct sk_buff *skb)
                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
net/bridge/br_private.h:static inline bool br_multicast_is_router(struct net_bridge *br)
                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Guenter