--- v1
+++ v2
@@ -1,82 +1,85 @@
From: Nikolay Aleksandrov <nikolay@nvidia.com>
-Add control and dump support for the global mcast_query_interval
-option which controls the interval between queries sent by the bridge
-after the end of the startup phase. To be consistent with the same
-bridge-wide option the value is reported with USER_HZ granularity and
+Add control and dump support for the global mcast_membership_interval
+option which controls the interval after which the bridge will leave a
+group if no reports have been received for it. 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.
+The default is 26000 (260 seconds).
Syntax:
- $ bridge vlan global set dev bridge vid 1 mcast_query_interval 13000
+ $ bridge vlan global set dev bridge vid 1 mcast_membership_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(-)
diff --git a/bridge/vlan.c b/bridge/vlan.c
-index c7cd069c29a4..206cbdea10cb 100644
+index 2a3dffdbac44..acdbb4a1b562 100644
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
-@@ -46,6 +46,7 @@ static void usage(void)
- " [ mcast_startup_query_count STARTUP_QUERY_COUNT ]\n"
- " [ mcast_membership_interval MEMBERSHIP_INTERVAL ]\n"
- " [ mcast_querier_interval QUERIER_INTERVAL ]\n"
-+ " [ mcast_query_interval QUERY_INTERVAL ]\n"
+@@ -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_membership_interval MEMBERSHIP_INTERVAL ]\n"
" bridge vlan global { show } [ dev DEV ] [ vid VLAN_ID ]\n");
exit(-1);
}
-@@ -465,6 +466,14 @@ static int vlan_global_option_set(int argc, char **argv)
+@@ -448,6 +449,14 @@ static int vlan_global_option_set(int argc, char **argv)
addattr64(&req.n, 1024,
- BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL,
+ BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL,
val64);
-+ } else if (strcmp(*argv, "mcast_query_interval") == 0) {
++ } else if (strcmp(*argv, "mcast_membership_interval") == 0) {
+ NEXT_ARG();
+ if (get_u64(&val64, *argv, 0))
-+ invarg("invalid mcast_query_interval",
++ invarg("invalid mcast_membership_interval",
+ *argv);
+ addattr64(&req.n, 1024,
-+ BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL,
++ BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL,
+ val64);
} else {
if (matches(*argv, "help") == 0)
NEXT_ARG();
-@@ -843,6 +852,12 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
- "mcast_querier_interval %llu ",
- rta_getattr_u64(vattr));
+@@ -814,6 +823,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_QUERY_INTVL]) {
-+ vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL];
-+ print_lluint(PRINT_ANY, "mcast_query_interval",
-+ "mcast_query_interval %llu ",
++ if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL]) {
++ vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL];
++ print_lluint(PRINT_ANY, "mcast_membership_interval",
++ "mcast_membership_interval %llu ",
+ rta_getattr_u64(vattr));
+ }
print_nl();
close_json_object();
}
diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
-index f5c72ec83f93..cb1170f8d5c9 100644
+index 0d973a9db0e0..a026ca16f89a 100644
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
-@@ -173,7 +173,9 @@ bridge \- show / manipulate bridge addresses and devices
- .B mcast_membership_interval
- .IR MEMBERSHIP_INTERVAL " ] [ "
- .B mcast_querier_interval
--.IR QUERIER_INTERVAL " ]"
-+.IR QUERIER_INTERVAL " ] [ "
-+.B mcast_query_interval
-+.IR QUERY_INTERVAL " ]"
+@@ -169,7 +169,9 @@ bridge \- show / manipulate bridge addresses and devices
+ .B mcast_last_member_interval
+ .IR LAST_MEMBER_INTERVAL " ] [ "
+ .B mcast_startup_query_count
+-.IR STARTUP_QUERY_COUNT " ]"
++.IR STARTUP_QUERY_COUNT " ] [ "
++.B mcast_membership_interval
++.IR MEMBERSHIP_INTERVAL " ]"
.ti -8
.BR "bridge vlan global" " [ " show " ] [ "
-@@ -981,6 +983,11 @@ after this delay has passed, the bridge will start to send its own queries
- .BI mcast_querier
- was enabled).
+@@ -964,6 +966,11 @@ 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_query_interval " QUERY_INTERVAL "
-+interval between queries sent by the bridge after the end of the
-+startup phase.
++.BI mcast_membership_interval " MEMBERSHIP_INTERVAL "
++delay after which the bridge will leave a group,
++if no membership reports for this group are received.
+
.SS bridge vlan global show - list global vlan options.