From 14f79941a8b8622ea0b2310685a4dc625ec3b2c5 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 28 Feb 2017 16:12:02 +0100 Subject: [PATCH] iplink: bridge: add support for IFLA_BR_MCAST_QUERIER_INTVL Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1417289 Upstream Status: iproute2.git commit 1f2244b851dd2 commit 1f2244b851dd21dd023b43afd902251d39b2d43b Author: Nikolay Aleksandrov Date: Tue Feb 9 00:14:35 2016 +0100 iplink: bridge: add support for IFLA_BR_MCAST_QUERIER_INTVL This patch implements support for the IFLA_BR_MCAST_QUERIER_INTVL attribute in iproute2 so it can change the querier 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 8f4c207..6f54dbb 100644 --- a/ip/iplink_bridge.c +++ b/ip/iplink_bridge.c @@ -43,6 +43,7 @@ static void print_explain(FILE *f) " [ mcast_startup_query_count STARTUP_QUERY_COUNT ]\n" " [ mcast_last_member_interval LAST_MEMBER_INTERVAL ]\n" " [ mcast_membership_interval MEMBERSHIP_INTERVAL ]\n" + " [ mcast_querier_interval QUERIER_INTERVAL ]\n" "\n" "Where: VLAN_PROTOCOL := { 802.1Q | 802.1ad }\n" ); @@ -250,6 +251,17 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv, } addattr64(n, 1024, IFLA_BR_MCAST_MEMBERSHIP_INTVL, mcast_membership_intvl); + } else if (matches(*argv, "mcast_querier_interval") == 0) { + __u64 mcast_querier_intvl; + + NEXT_ARG(); + if (get_u64(&mcast_querier_intvl, *argv, 0)) { + invarg("invalid mcast_querier_interval", + *argv); + return -1; + } + addattr64(n, 1024, IFLA_BR_MCAST_QUERIER_INTVL, + mcast_querier_intvl); } else if (matches(*argv, "help") == 0) { explain(); return -1; @@ -427,6 +439,10 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) if (tb[IFLA_BR_MCAST_MEMBERSHIP_INTVL]) fprintf(f, "mcast_membership_interval %llu ", rta_getattr_u64(tb[IFLA_BR_MCAST_MEMBERSHIP_INTVL])); + + if (tb[IFLA_BR_MCAST_QUERIER_INTVL]) + fprintf(f, "mcast_querier_interval %llu ", + rta_getattr_u64(tb[IFLA_BR_MCAST_QUERIER_INTVL])); } static void bridge_print_help(struct link_util *lu, int argc, char **argv, -- 1.8.3.1