bridge: vlan: add global mcast_startup_query_count option

Add control and dump support for the global mcast_startup_query_count
option which controls the number of queries the bridge will send on the
vlan during startup phase (default 2).
Syntax:
 $ bridge vlan global set dev bridge vid 1 mcast_startup_query_count 5

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 0bdaaabb8ac6420a11ca443a8ea08b96b14157fd..c68f83407c0fcace1c0cfd7f135afee3d87de843 100644 (file)
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -43,6 +43,7 @@ static void usage(void)
                "                      [ mcast_igmp_version IGMP_VERSION ]\n"
                "                      [ mcast_mld_version MLD_VERSION ]\n"
                "                      [ mcast_last_member_count LAST_MEMBER_COUNT ]\n"
+               "                      [ mcast_startup_query_count STARTUP_QUERY_COUNT ]\n"
                "       bridge vlan global { show } [ dev DEV ] [ vid VLAN_ID ]\n");
        exit(-1);
 }
@@ -429,6 +430,14 @@ static int vlan_global_option_set(int argc, char **argv)
                        addattr32(&req.n, 1024,
                                  BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT,
                                  val32);
+               } else if (strcmp(*argv, "mcast_startup_query_count") == 0) {
+                       NEXT_ARG();
+                       if (get_u32(&val32, *argv, 0))
+                               invarg("invalid mcast_startup_query_count",
+                                      *argv);
+                       addattr32(&req.n, 1024,
+                                 BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT,
+                                 val32);
                } else {
                        if (strcmp(*argv, "help") == 0)
                                NEXT_ARG();
@@ -783,6 +792,12 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
                           "mcast_last_member_count %u ",
                           rta_getattr_u32(vattr));
        }
+       if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT]) {
+               vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT];
+               print_uint(PRINT_ANY, "mcast_startup_query_count",
+                          "mcast_startup_query_count %u ",
+                          rta_getattr_u32(vattr));
+       }
        print_nl();
        close_json_object();
 }

diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index cea755184336d707600c7e4d581f3766ff5124ee..7741382321cbbe752110bfdf6e091021e1321a72 100644 (file)
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -165,7 +165,9 @@ bridge \- show / manipulate bridge addresses and devices
 .B mcast_mld_version
 .IR MLD_VERSION " ] [ "
 .B mcast_last_member_count
-.IR LAST_MEMBER_COUNT " ]"
+.IR LAST_MEMBER_COUNT " ] [ "
+.B mcast_startup_query_count
+.IR STARTUP_QUERY_COUNT " ]"
 
 .ti -8
 .BR "bridge vlan global" " [ " show " ] [ "
@@ -951,6 +953,10 @@ set multicast last member count, ie the number of queries the bridge
 will send before stopping forwarding a multicast group after a "leave"
 message has been received. Default is 2.
 
+.TP
+.BI mcast_startup_query_count " STARTUP_QUERY_COUNT "
+set the number of queries to send during startup phase. Default is 2.
+
 .SS bridge vlan global show - list global vlan options.
 
 This command displays the global VLAN options for each VLAN entry.