--- v1
+++ v2
@@ -1,82 +1,88 @@
From: Nikolay Aleksandrov <nikolay@nvidia.com>
-Add control and dump support for the global mcast_query_response_interval
-option which sets the Max Response Time/Maximum Response Delay for IGMP/MLD
-queries sent by the bridge. 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.
+Add control and dump support for the global mcast_querier_interval
+option which controls the interval after which if no other router
+queries are seen the bridge will start sending its own queries.
+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_query_response_interval 13000
+ $ bridge vlan global set dev bridge vid 1 mcast_querier_interval 13000
Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
---
+v2: adjust help msg alignment to fit in 100 columns
+
bridge/vlan.c | 15 +++++++++++++++
- man/man8/bridge.8 | 9 ++++++++-
- 2 files changed, 23 insertions(+), 1 deletion(-)
+ man/man8/bridge.8 | 12 +++++++++++-
+ 2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/bridge/vlan.c b/bridge/vlan.c
-index 206cbdea10cb..0f6d8849843f 100644
+index acdbb4a1b562..5494dd15c76e 100644
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
-@@ -47,6 +47,7 @@ static void usage(void)
- " [ mcast_membership_interval MEMBERSHIP_INTERVAL ]\n"
- " [ mcast_querier_interval QUERIER_INTERVAL ]\n"
- " [ mcast_query_interval QUERY_INTERVAL ]\n"
-+ " [ mcast_query_response_interval QUERY_RESPONSE_INTERVAL ]\n"
+@@ -46,6 +46,7 @@ static void usage(void)
+ " [ mcast_last_member_interval LAST_MEMBER_INTERVAL ]\n"
+ " [ mcast_startup_query_count STARTUP_QUERY_COUNT ]\n"
+ " [ mcast_membership_interval MEMBERSHIP_INTERVAL ]\n"
++ " [ mcast_querier_interval QUERIER_INTERVAL ]\n"
" bridge vlan global { show } [ dev DEV ] [ vid VLAN_ID ]\n");
exit(-1);
}
-@@ -474,6 +475,14 @@ static int vlan_global_option_set(int argc, char **argv)
+@@ -457,6 +458,14 @@ static int vlan_global_option_set(int argc, char **argv)
addattr64(&req.n, 1024,
- BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL,
+ BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL,
val64);
-+ } else if (strcmp(*argv, "mcast_query_response_interval") == 0) {
++ } else if (strcmp(*argv, "mcast_querier_interval") == 0) {
+ NEXT_ARG();
+ if (get_u64(&val64, *argv, 0))
-+ invarg("invalid mcast_query_response_interval",
++ invarg("invalid mcast_querier_interval",
+ *argv);
+ addattr64(&req.n, 1024,
-+ BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL,
++ BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL,
+ val64);
} else {
if (matches(*argv, "help") == 0)
NEXT_ARG();
-@@ -858,6 +867,12 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
- "mcast_query_interval %llu ",
+@@ -829,6 +838,12 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
+ "mcast_membership_interval %llu ",
rta_getattr_u64(vattr));
}
-+ if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL]) {
-+ vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_RESPONSE_INTVL];
-+ print_lluint(PRINT_ANY, "mcast_query_response_interval",
-+ "mcast_query_response_interval %llu ",
++ if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL]) {
++ vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL];
++ print_lluint(PRINT_ANY, "mcast_querier_interval",
++ "mcast_querier_interval %llu ",
+ rta_getattr_u64(vattr));
+ }
print_nl();
close_json_object();
}
diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
-index cb1170f8d5c9..e9cd5f9f4fe6 100644
+index a026ca16f89a..f5c72ec83f93 100644
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
-@@ -175,7 +175,9 @@ bridge \- show / manipulate bridge addresses and devices
- .B mcast_querier_interval
- .IR QUERIER_INTERVAL " ] [ "
- .B mcast_query_interval
--.IR QUERY_INTERVAL " ]"
-+.IR QUERY_INTERVAL " ] [ "
-+.B mcast_query_response_interval
-+.IR QUERY_RESPONSE_INTERVAL " ]"
+@@ -171,7 +171,9 @@ bridge \- show / manipulate bridge addresses and devices
+ .B mcast_startup_query_count
+ .IR STARTUP_QUERY_COUNT " ] [ "
+ .B mcast_membership_interval
+-.IR MEMBERSHIP_INTERVAL " ]"
++.IR MEMBERSHIP_INTERVAL " ] [ "
++.B mcast_querier_interval
++.IR QUERIER_INTERVAL " ]"
.ti -8
.BR "bridge vlan global" " [ " show " ] [ "
-@@ -988,6 +990,11 @@ was enabled).
- interval between queries sent by the bridge after the end of the
- startup phase.
+@@ -971,6 +973,14 @@ set the number of queries to send during startup phase. Default is 2.
+ delay after which the bridge will leave a group,
+ if no membership reports for this group are received.
+.TP
-+.BI mcast_query_response_interval " QUERY_RESPONSE_INTERVAL "
-+set the Max Response Time/Maximum Response Delay for IGMP/MLD
-+queries sent by the bridge.
++.BI mcast_querier_interval " QUERIER_INTERVAL "
++interval between queries sent by other routers. If no queries are seen
++after this delay has passed, the bridge will start to send its own queries
++(as if
++.BI mcast_querier
++was enabled).
+
.SS bridge vlan global show - list global vlan options.