From: Hangbin Liu Date: Wed, 18 Jan 2017 06:12:51 +0000 (+0800) Subject: iplink: bridge: add support for IFLA_BR_MCAST_MLD_VERSION X-Git-Tag: v4.11.0~85 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3f1e3c4254a11da884793602e60399348b76d72;p=thirdparty%2Fiproute2.git iplink: bridge: add support for IFLA_BR_MCAST_MLD_VERSION This patch implements support for the IFLA_BR_MCAST_MLD_VERSION attribute in iproute2 so it can change the mcast mld version. Reviewed-by: Nikolay Aleksandrov Signed-off-by: Hangbin Liu --- diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c index 3e9143eab..a17ff3555 100644 --- a/ip/iplink_bridge.c +++ b/ip/iplink_bridge.c @@ -51,6 +51,7 @@ static void print_explain(FILE *f) " [ mcast_startup_query_interval STARTUP_QUERY_INTERVAL ]\n" " [ mcast_stats_enabled MCAST_STATS_ENABLED ]\n" " [ mcast_igmp_version IGMP_VERSION ]\n" + " [ mcast_mld_version MLD_VERSION ]\n" " [ nf_call_iptables NF_CALL_IPTABLES ]\n" " [ nf_call_ip6tables NF_CALL_IP6TABLES ]\n" " [ nf_call_arptables NF_CALL_ARPTABLES ]\n" @@ -317,6 +318,14 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv, invarg("invalid mcast_igmp_version", *argv); addattr8(n, 1024, IFLA_BR_MCAST_IGMP_VERSION, igmp_version); + } else if (matches(*argv, "mcast_mld_version") == 0) { + __u8 mld_version; + + NEXT_ARG(); + if (get_u8(&mld_version, *argv, 0)) + invarg("invalid mcast_mld_version", *argv); + addattr8(n, 1024, IFLA_BR_MCAST_MLD_VERSION, + mld_version); } else if (matches(*argv, "nf_call_iptables") == 0) { __u8 nf_call_ipt; @@ -550,6 +559,10 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) fprintf(f, "mcast_igmp_version %u ", rta_getattr_u8(tb[IFLA_BR_MCAST_IGMP_VERSION])); + if (tb[IFLA_BR_MCAST_MLD_VERSION]) + fprintf(f, "mcast_mld_version %u ", + rta_getattr_u8(tb[IFLA_BR_MCAST_MLD_VERSION])); + if (tb[IFLA_BR_NF_CALL_IPTABLES]) fprintf(f, "nf_call_iptables %u ", rta_getattr_u8(tb[IFLA_BR_NF_CALL_IPTABLES]));