diff options
author | Nikolay Aleksandrov <nikolay@nvidia.com> | 2021-09-01 13:38:16 +0300 |
---|---|---|
committer | David Ahern <dsahern@kernel.org> | 2021-09-06 17:00:31 -0600 |
commit | ae895504c6bb6e4757331e5c46caa4f4df611a5b (patch) | |
tree | 900a96fd383fa34fdee1e4679359b76d04abff2f /bridge | |
parent | 12fbe3e4eb2860c2be4107651d1ea0ee5e7e7113 (diff) | |
download | iproute2-ae895504c6bb6e4757331e5c46caa4f4df611a5b.tar.gz |
bridge: vlan: add support for mcast_router option
Add support for setting and dumping per-vlan/interface mcast_router
option. It controls the mcast router mode of a vlan/interface pair.
For bridge devices only modes 0 - 2 are allowed. The possible modes
are:
0 - disabled
1 - automatic router presence detection (default)
2 - permanent router
3 - temporary router (available only for ports)
Example:
# mark port ens16 as a permanent mcast router for vlan 100
$ bridge vlan set dev ens16 vid 100 mcast_router 2
# disable mcast router for port ens16 and vlan 200
$ bridge vlan set dev ens16 vid 200 mcast_router 0
$ bridge -d vlan show
port vlan-id
ens16 1 PVID Egress Untagged
state forwarding mcast_router 1
100
state forwarding mcast_router 2
200
state forwarding mcast_router 0
Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
Diffstat (limited to 'bridge')
-rw-r--r-- | bridge/vlan.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/bridge/vlan.c b/bridge/vlan.c index 48365bca..8300f353 100644 --- a/bridge/vlan.c +++ b/bridge/vlan.c @@ -36,6 +36,7 @@ static void usage(void) " [ pvid ] [ untagged ]\n" " [ self ] [ master ]\n" " bridge vlan { set } vid VLAN_ID dev DEV [ state STP_STATE ]\n" + " [ mcast_router MULTICAST_ROUTER ]\n" " bridge vlan { show } [ dev DEV ] [ vid VLAN_ID ]\n" " bridge vlan { tunnelshow } [ dev DEV ] [ vid VLAN_ID ]\n" " bridge vlan global { set } vid VLAN_ID dev DEV\n" @@ -334,6 +335,15 @@ static int vlan_option_set(int argc, char **argv) } addattr8(&req.n, sizeof(req), BRIDGE_VLANDB_ENTRY_STATE, state); + } else if (strcmp(*argv, "mcast_router") == 0) { + __u8 mcast_router; + + NEXT_ARG(); + if (get_u8(&mcast_router, *argv, 0)) + invarg("invalid mcast_router", *argv); + addattr8(&req.n, sizeof(req), + BRIDGE_VLANDB_ENTRY_MCAST_ROUTER, + mcast_router); } else { if (matches(*argv, "help") == 0) NEXT_ARG(); @@ -942,7 +952,7 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex) static void print_vlan_opts(struct rtattr *a, int ifindex) { - struct rtattr *vtb[BRIDGE_VLANDB_ENTRY_MAX + 1]; + struct rtattr *vtb[BRIDGE_VLANDB_ENTRY_MAX + 1], *vattr; struct bridge_vlan_xstats vstats; struct bridge_vlan_info *vinfo; __u16 vrange = 0; @@ -1006,6 +1016,11 @@ static void print_vlan_opts(struct rtattr *a, int ifindex) print_nl(); print_string(PRINT_FP, NULL, "%-" __stringify(IFNAMSIZ) "s ", ""); print_stp_state(state); + if (vtb[BRIDGE_VLANDB_ENTRY_MCAST_ROUTER]) { + vattr = vtb[BRIDGE_VLANDB_ENTRY_MCAST_ROUTER]; + print_uint(PRINT_ANY, "mcast_router", "mcast_router %u ", + rta_getattr_u8(vattr)); + } print_nl(); if (show_stats) __print_one_vlan_stats(&vstats); |