bridge: vlan: add global mcast_startup_query_interval option

Add control and dump support for the global mcast_startup_query_interval
option which controls the interval between queries in the startup phase.
To be consistent with the same bridge-wide option the value is reported
with USER_HZ granularity and the same granularity is expected when setting
it.
Syntax:
 $ bridge vlan global set dev bridge vid 1 mcast_startup_query_interval 15000

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 83fd537903a1312b0cacaf1b2d53f1e47fa2e669..54910793200bbd44a0ea968d1bbcd7fed5b28e07 100644 (file)
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -45,6 +45,7 @@ static void usage(void)
                "                      [ mcast_last_member_count LAST_MEMBER_COUNT ]\n"
                "                      [ mcast_last_member_interval LAST_MEMBER_INTERVAL ]\n"
                "                      [ mcast_startup_query_count STARTUP_QUERY_COUNT ]\n"
+               "                      [ mcast_startup_query_interval STARTUP_QUERY_INTERVAL ]\n"
                "                      [ mcast_membership_interval MEMBERSHIP_INTERVAL ]\n"
                "                      [ mcast_querier_interval QUERIER_INTERVAL ]\n"
                "                      [ mcast_query_interval QUERY_INTERVAL ]\n"
@@ -484,6 +485,14 @@ static int vlan_global_option_set(int argc, char **argv)
                        addattr64(&req.n, 1024,
                                  BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL,
                                  val64);
+               } else if (strcmp(*argv, "mcast_startup_query_interval") == 0) {
+                       NEXT_ARG();
+                       if (get_u64(&val64, *argv, 0))
+                               invarg("invalid mcast_startup_query_interval",
+                                      *argv);
+                       addattr64(&req.n, 1024,
+                                 BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL,
+                                 val64);
                } else {
                        if (strcmp(*argv, "help") == 0)
                                NEXT_ARG();
@@ -850,6 +859,12 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
                           "mcast_startup_query_count %u ",
                           rta_getattr_u32(vattr));
        }
+       if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL]) {
+               vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL];
+               print_lluint(PRINT_ANY, "mcast_startup_query_interval",
+                            "mcast_startup_query_interval %llu ",
+                            rta_getattr_u64(vattr));
+       }
        if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL]) {
                vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL];
                print_lluint(PRINT_ANY, "mcast_membership_interval",

diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index e9cd5f9f4fe6ab0ca7842213c9e1dc3e53ae4e79..eeceb309d2191fcf57444557b9e13645df72ef61 100644 (file)
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -170,6 +170,8 @@ bridge \- show / manipulate bridge addresses and devices
 .IR LAST_MEMBER_INTERVAL " ] [ "
 .B mcast_startup_query_count
 .IR STARTUP_QUERY_COUNT " ] [ "
+.B mcast_startup_query_interval
+.IR STARTUP_QUERY_INTERVAL " ] [ "
 .B mcast_membership_interval
 .IR MEMBERSHIP_INTERVAL " ] [ "
 .B mcast_querier_interval
@@ -972,6 +974,10 @@ after a "leave" message is received.
 .BI mcast_startup_query_count " STARTUP_QUERY_COUNT "
 set the number of queries to send during startup phase. Default is 2.
 
+.TP
+.BI mcast_startup_query_interval " STARTUP_QUERY_INTERVAL "
+interval between queries in the startup phase.
+
 .TP
 .BI mcast_membership_interval " MEMBERSHIP_INTERVAL "
 delay after which the bridge will leave a group,