net: bridge: mcast: prepare is-router function for mcast router split
authorLinus Lüssing <linus.luessing@c0d3.blue>
Thu, 13 May 2021 13:20:47 +0000 (15:20 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 13 May 2021 21:04:31 +0000 (14:04 -0700)
commit1a3065a26807b4cdd65d3b696ddb18385610f7da
tree44f25dfd1ac226806720df116d11b2b60b580331
parentb19232effd09c2cb5e11b1b74547406a3c9adc5a
net: bridge: mcast: prepare is-router function for mcast router split

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@c0d3.blue>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_input.c
net/bridge/br_multicast.c
net/bridge/br_private.h