OSDN Git Service

net: bridge: vlan: convert mcast router global option to per-vlan entry
authorNikolay Aleksandrov <nikolay@nvidia.com>
Fri, 20 Aug 2021 12:42:55 +0000 (15:42 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 Aug 2021 14:00:35 +0000 (15:00 +0100)
commit2796d846d74a18cc6563e96eff8bf28c5e06f912
tree71d8b57b3c5b4326fc3a1dbedff9a929bfa88e56
parenta53581d5559eaacaac1b4aed8e2f22c40efa5acc
net: bridge: vlan: convert mcast router global option to per-vlan entry

The per-vlan router option controls the port/vlan and host vlan entries'
mcast router config. The global option controlled only the host vlan
config, but that is unnecessary and incosistent as it's not really a
global vlan option, but rather bridge option to control host router
config, so convert BRIDGE_VLANDB_GOPTS_MCAST_ROUTER to
BRIDGE_VLANDB_ENTRY_MCAST_ROUTER which can be used to control both host
vlan and port vlan mcast router config.

Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/uapi/linux/if_bridge.h
net/bridge/br_multicast.c
net/bridge/br_private.h
net/bridge/br_vlan.c
net/bridge/br_vlan_options.c