iplink: bridge: add support for IFLA_BR_MCAST_STARTUP_QUERY_INTVL

This patch implements support for the IFLA_BR_MCAST_STARTUP_QUERY_INTVL
attribute in iproute2 so it can change the startup query interval.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>

diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
index 92060eeae1cc97910ff5250676eae5bfb87f4d82..a55a36adacdfade2fbf89e5dcbe106746c2879d0 100644 (file)
--- a/ip/iplink_bridge.c
+++ b/ip/iplink_bridge.c
@@ -46,6 +46,7 @@ static void print_explain(FILE *f)
                "                  [ mcast_querier_interval QUERIER_INTERVAL ]\n"
                "                  [ mcast_query_interval QUERY_INTERVAL ]\n"
                "                  [ mcast_query_response_interval QUERY_RESPONSE_INTERVAL ]\n"
+               "                  [ mcast_startup_query_interval STARTUP_QUERY_INTERVAL ]\n"
                "\n"
                "Where: VLAN_PROTOCOL := { 802.1Q | 802.1ad }\n"
        );
@@ -280,6 +281,17 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv,
                        }
                        addattr64(n, 1024, IFLA_BR_MCAST_QUERY_RESPONSE_INTVL,
                                  mcast_query_resp_intvl);
+               } else if (!matches(*argv, "mcast_startup_query_interval")) {
+                       __u64 mcast_startup_query_intvl;
+
+                       NEXT_ARG();
+                       if (get_u64(&mcast_startup_query_intvl, *argv, 0)) {
+                               invarg("invalid mcast_startup_query_interval",
+                                      *argv);
+                               return -1;
+                       }
+                       addattr64(n, 1024, IFLA_BR_MCAST_STARTUP_QUERY_INTVL,
+                                 mcast_startup_query_intvl);
                } else if (matches(*argv, "help") == 0) {
                        explain();
                        return -1;
@@ -469,6 +481,10 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
        if (tb[IFLA_BR_MCAST_QUERY_RESPONSE_INTVL])
                fprintf(f, "mcast_query_response_interval %llu ",
                        rta_getattr_u64(tb[IFLA_BR_MCAST_QUERY_RESPONSE_INTVL]));
+
+       if (tb[IFLA_BR_MCAST_STARTUP_QUERY_INTVL])
+               fprintf(f, "mcast_startup_query_interval %llu ",
+                       rta_getattr_u64(tb[IFLA_BR_MCAST_STARTUP_QUERY_INTVL]));
 }
 
 static void bridge_print_help(struct link_util *lu, int argc, char **argv,