From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikolay Aleksandrov Subject: [PATCH iproute2 18/21] iplink: bridge: add support for IFLA_BR_MCAST_QUERY_INTVL Date: Mon, 8 Feb 2016 12:55:24 +0100 Message-ID: <1454932527-30569-19-git-send-email-razor@blackwall.org> References: <1454932527-30569-1-git-send-email-razor@blackwall.org> Cc: roopa@cumulusnetworks.com, stephen@networkplumber.org, Nikolay Aleksandrov To: netdev@vger.kernel.org Return-path: Received: from mail-wm0-f49.google.com ([74.125.82.49]:35596 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752736AbcBHL4Y (ORCPT ); Mon, 8 Feb 2016 06:56:24 -0500 Received: by mail-wm0-f49.google.com with SMTP id c200so11890910wme.0 for ; Mon, 08 Feb 2016 03:56:23 -0800 (PST) In-Reply-To: <1454932527-30569-1-git-send-email-razor@blackwall.org> Sender: netdev-owner@vger.kernel.org List-ID: From: Nikolay Aleksandrov This patch implements support for the IFLA_BR_MCAST_QUERY_INTVL attribute in iproute2 so it can change the query interval. Signed-off-by: Nikolay Aleksandrov --- ip/iplink_bridge.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c index f896f54aa6f8..c5e1fcc6b9a9 100644 --- a/ip/iplink_bridge.c +++ b/ip/iplink_bridge.c @@ -43,6 +43,7 @@ static void print_explain(FILE *f) " [ mcast_last_member_interval LAST_MEMBER_INTERVAL ]\n" " [ mcast_membership_interval MEMBERSHIP_INTERVAL ]\n" " [ mcast_querier_interval QUERIER_INTERVAL ]\n" + " [ mcast_query_interval QUERY_INTERVAL ]\n" "\n" "Where: VLAN_PROTOCOL := { 802.1Q | 802.1ad }\n" ); @@ -255,6 +256,17 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv, } addattr64(n, 1024, IFLA_BR_MCAST_QUERIER_INTVL, mcast_querier_intvl); + } else if (matches(*argv, "mcast_query_interval") == 0) { + __u64 mcast_query_intvl; + + NEXT_ARG(); + if (get_u64(&mcast_query_intvl, *argv, 0)) { + invarg("invalid mcast_query_interval", + *argv); + return -1; + } + addattr64(n, 1024, IFLA_BR_MCAST_QUERY_INTVL, + mcast_query_intvl); } else if (matches(*argv, "help") == 0) { explain(); return -1; @@ -418,6 +430,10 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) if (tb[IFLA_BR_MCAST_QUERIER_INTVL]) fprintf(f, "mcast_querier_interval %llu ", rta_getattr_u64(tb[IFLA_BR_MCAST_QUERIER_INTVL])); + + if (tb[IFLA_BR_MCAST_QUERY_INTVL]) + fprintf(f, "mcast_query_interval %llu ", + rta_getattr_u64(tb[IFLA_BR_MCAST_QUERY_INTVL])); } static void bridge_print_help(struct link_util *lu, int argc, char **argv, -- 2.4.3