On 13/05/2021 02:19, 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 <linus.luessing@xxxxxxxxx> > --- > net/bridge/br_input.c | 2 +- > net/bridge/br_multicast.c | 5 +++-- > net/bridge/br_private.h | 37 +++++++++++++++++++++++++++++++++---- > 3 files changed, 37 insertions(+), 7 deletions(-) > Acked-by: Nikolay Aleksandrov <nikolay@xxxxxxxxxx>
