bridge: vlan: add global mcast_igmp_version option

Add control and dump support for the global mcast_igmp_version option
which controls the IGMP version on the vlan (default 2).
Syntax: $ bridge vlan global set dev bridge vid 1 mcast_igmp_version 3

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 220ba3035b974da2491e75de00b0f3f24a190951..0864f3b73b6efc3e764b967e17d45ba321bfd90a 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_igmp_version IGMP_VERSION ]\n"
                "       bridge vlan global { show } [ dev DEV ] [ vid VLAN_ID ]\n");
        exit(-1);
 }
@@ -406,6 +407,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_igmp_version") == 0) {
+                       NEXT_ARG();
+                       if (get_u8(&val8, *argv, 0))
+                               invarg("invalid mcast_igmp_version", *argv);
+                       addattr8(&req.n, 1024,
+                                BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION, val8);
                } else {
                        if (strcmp(*argv, "help") == 0)
                                NEXT_ARG();
@@ -744,6 +751,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_IGMP_VERSION]) {
+               vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION];
+               print_uint(PRINT_ANY, "mcast_igmp_version",
+                          "mcast_igmp_version %u ", rta_getattr_u8(vattr));
+       }
        print_nl();
        close_json_object();
 }

diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index d894289b2dc23e5141206f7ae3c891bd183bb1e0..224647b49843bbcb42a9e0d150815c0319edf44b 100644 (file)
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -159,7 +159,9 @@ bridge \- show / manipulate bridge addresses and devices
 .B vid
 .IR VID " [ "
 .B mcast_snooping
-.IR MULTICAST_SNOOPING " ]"
+.IR MULTICAST_SNOOPING " ] [ "
+.B mcast_igmp_version
+.IR IGMP_VERSION " ]"
 
 .ti -8
 .BR "bridge vlan global" " [ " show " ] [ "
@@ -931,6 +933,10 @@ turn multicast snooping for VLAN entry with VLAN ID on
 or off
 .RI ( MULTICAST_SNOOPING " == 0). Default is on. "
 
+.TP
+.BI mcast_igmp_version " IGMP_VERSION "
+set the IGMP version. Default is 2.
+
 .SS bridge vlan global show - list global vlan options.
 
 This command displays the global VLAN options for each VLAN entry.