bridge: vlan: add global mcast_querier option

Add control and dump support for the global mcast_querier option which
controls if the bridge will act as a multicast querier for that vlan.
Syntax: $ bridge vlan global set dev bridge vid 1 mcast_querier 1

Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/bridge/vlan.c b/bridge/vlan.c
index 54910793200bbd44a0ea968d1bbcd7fed5b28e07..abc24debc4f7463ba024e9d0f91809c70c2bf2f5 100644 (file)
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -40,6 +40,7 @@ static void usage(void)
                "       bridge vlan { tunnelshow } [ dev DEV ] [ vid VLAN_ID ]\n"
                "       bridge vlan global { set } vid VLAN_ID dev DEV\n"
                "                      [ mcast_snooping MULTICAST_SNOOPING ]\n"
+               "                      [ mcast_querier MULTICAST_QUERIER ]\n"
                "                      [ mcast_igmp_version IGMP_VERSION ]\n"
                "                      [ mcast_mld_version MLD_VERSION ]\n"
                "                      [ mcast_last_member_count LAST_MEMBER_COUNT ]\n"
@@ -418,6 +419,12 @@ static int vlan_global_option_set(int argc, char **argv)
                                invarg("invalid mcast_snooping", *argv);
                        addattr8(&req.n, 1024,
                                 BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING, val8);
+               } else if (strcmp(*argv, "mcast_querier") == 0) {
+                       NEXT_ARG();
+                       if (get_u8(&val8, *argv, 0))
+                               invarg("invalid mcast_querier", *argv);
+                       addattr8(&req.n, 1024,
+                                BRIDGE_VLANDB_GOPTS_MCAST_QUERIER, val8);
                } else if (strcmp(*argv, "mcast_igmp_version") == 0) {
                        NEXT_ARG();
                        if (get_u8(&val8, *argv, 0))
@@ -831,6 +838,11 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
                print_uint(PRINT_ANY, "mcast_snooping", "mcast_snooping %u ",
                           rta_getattr_u8(vattr));
        }
+       if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER]) {
+               vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER];
+               print_uint(PRINT_ANY, "mcast_querier", "mcast_querier %u ",
+                          rta_getattr_u8(vattr));
+       }
        if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION]) {
                vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION];
                print_uint(PRINT_ANY, "mcast_igmp_version",

diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index eeceb309d2191fcf57444557b9e13645df72ef61..76d2fa09d5bc0808c102e9dec6b0e66866805d28 100644 (file)
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -160,6 +160,8 @@ bridge \- show / manipulate bridge addresses and devices
 .IR VID " [ "
 .B mcast_snooping
 .IR MULTICAST_SNOOPING " ] [ "
+.B mcast_querier
+.IR MULTICAST_QUERIER " ] [ "
 .B mcast_igmp_version
 .IR IGMP_VERSION " ] [ "
 .B mcast_mld_version
@@ -951,6 +953,14 @@ turn multicast snooping for VLAN entry with VLAN ID on
 or off
 .RI ( MULTICAST_SNOOPING " == 0). Default is on. "
 
+.TP
+.BI mcast_querier " MULTICAST_QUERIER "
+enable
+.RI ( MULTICAST_QUERIER " > 0) "
+or disable
+.RI ( MULTICAST_QUERIER " == 0) "
+IGMP/MLD querier, ie sending of multicast queries by the bridge. Default is disabled.
+
 .TP
 .BI mcast_igmp_version " IGMP_VERSION "
 set the IGMP version. Default is 2.