bridge: vlan: add global mcast_last_member_count option

Add control and dump support for the global mcast_last_member_count option
which controls the number of queries the bridge will send on the vlan after
a leave is received (default 2).
Syntax:
 $ bridge vlan global set dev bridge vid 1 mcast_last_member_count 10

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 fd9539ae44061f9268578f7645046df0d96198a2..0bdaaabb8ac6420a11ca443a8ea08b96b14157fd 100644 (file)
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -42,6 +42,7 @@ static void usage(void)
                "                      [ mcast_snooping MULTICAST_SNOOPING ]\n"
                "                      [ mcast_igmp_version IGMP_VERSION ]\n"
                "                      [ mcast_mld_version MLD_VERSION ]\n"
+               "                      [ mcast_last_member_count LAST_MEMBER_COUNT ]\n"
                "       bridge vlan global { show } [ dev DEV ] [ vid VLAN_ID ]\n");
        exit(-1);
 }
@@ -359,6 +360,7 @@ static int vlan_global_option_set(int argc, char **argv)
        short vid_end = -1;
        char *d = NULL;
        short vid = -1;
+       __u32 val32;
        __u8 val8;
 
        afspec = addattr_nest(&req.n, sizeof(req),
@@ -420,6 +422,13 @@ static int vlan_global_option_set(int argc, char **argv)
                                invarg("invalid mcast_mld_version", *argv);
                        addattr8(&req.n, 1024,
                                 BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION, val8);
+               } else if (strcmp(*argv, "mcast_last_member_count") == 0) {
+                       NEXT_ARG();
+                       if (get_u32(&val32, *argv, 0))
+                               invarg("invalid mcast_last_member_count", *argv);
+                       addattr32(&req.n, 1024,
+                                 BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT,
+                                 val32);
                } else {
                        if (strcmp(*argv, "help") == 0)
                                NEXT_ARG();
@@ -768,6 +777,12 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
                print_uint(PRINT_ANY, "mcast_mld_version",
                           "mcast_mld_version %u ", rta_getattr_u8(vattr));
        }
+       if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION]) {
+               vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT];
+               print_uint(PRINT_ANY, "mcast_last_member_count",
+                          "mcast_last_member_count %u ",
+                          rta_getattr_u32(vattr));
+       }
        print_nl();
        close_json_object();
 }

diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index dcbff9367334813c67bd8a180cb35774434ba200..cea755184336d707600c7e4d581f3766ff5124ee 100644 (file)
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -163,7 +163,9 @@ bridge \- show / manipulate bridge addresses and devices
 .B mcast_igmp_version
 .IR IGMP_VERSION " ] [ "
 .B mcast_mld_version
-.IR MLD_VERSION " ]"
+.IR MLD_VERSION " ] [ "
+.B mcast_last_member_count
+.IR LAST_MEMBER_COUNT " ]"
 
 .ti -8
 .BR "bridge vlan global" " [ " show " ] [ "
@@ -943,6 +945,12 @@ set the IGMP version. Default is 2.
 .BI mcast_mld_version " MLD_VERSION "
 set the MLD version. Default is 1.
 
+.TP
+.BI mcast_last_member_count " LAST_MEMBER_COUNT "
+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.
+
 .SS bridge vlan global show - list global vlan options.
 
 This command displays the global VLAN options for each VLAN entry.