From patchwork Mon Feb 8 23:14:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 580544 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 08ED41401DE for ; Tue, 9 Feb 2016 10:15:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=blackwall-org.20150623.gappssmtp.com header.i=@blackwall-org.20150623.gappssmtp.com header.b=tDHk3v0C; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932652AbcBHXPn (ORCPT ); Mon, 8 Feb 2016 18:15:43 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:37482 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932584AbcBHXPB (ORCPT ); Mon, 8 Feb 2016 18:15:01 -0500 Received: by mail-wm0-f47.google.com with SMTP id g62so862856wme.0 for ; Mon, 08 Feb 2016 15:15:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=blackwall-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2Nd5INkEl9MxYOAlipbUuOef16VDXfegDjk31J+8n9s=; b=tDHk3v0CdxbnTd69CJzpK76i/v8LSZiAEyXw3K8zbZveDpoIEw77S3hzUwjaxO5qG5 a1uZi6rSOQE8S1Yzzyrx/6Y6tXJ7vuVEC/4r51MFws84Ip+3GKTBl7TcdGlOgQV6vgmr tjQMmyYrv7JUUi076WLAEIKhHtZVi9v1lVsxZzvJ8HmdICgZHlAcy1VlKbRr4KXKyY1+ S1oOk5BTB3kFhmrRqP7gIWo9prcOcxQqBzluaiIiM10Ey0fWmr4QGs5lzEH8xJGyQqjN l9D6Ppb32MXL21kOrAu3TVR2d3S2uMHQKyJtjRGOFAdH1BHIFJslq+3ASEBrA2cFImH6 P3Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2Nd5INkEl9MxYOAlipbUuOef16VDXfegDjk31J+8n9s=; b=VIQrAqFEeOlCAxpSXwpJc8RpI+Gkie9s/h2s+P6HS5l9KQfJLT8MTYmXOvqQKKqzYE 4RHnCKg5MGWESFwZf8mfKX5RdZATbUZwocxcnvvlHxnsrAlyqPu5iMir3GRgwqbXm3mJ 7hZGXD1SCxOiSDT/CmiD/gg2W9aXaCsYYp6iLwWYffjmcAJKWNOOWE8VTGTZLn2a24rE lXAv+3eaT0wf5LkIXTpHRHgnSv/S9Ou8McXRyy5mMrOfGjuGi/hu2lCaMwGwia19uvUx 43gDogowL1hOK8NNrAc5TSWLrOE7jyZcQb6f0+JvhgCfEH/uXORSEp9l8CIJoQwh0dGL dGqg== X-Gm-Message-State: AG10YOSAXHIhwaiIk2NlbOGBv01NcforC+kTZTlX1+ui3h3Ji6Ov8eZyPZJ58lCezDAUZg== X-Received: by 10.194.61.111 with SMTP id o15mr30866156wjr.104.1454973299854; Mon, 08 Feb 2016 15:14:59 -0800 (PST) Received: from debil.localdomain (ip4-62-4-104-109.cust.nbox.cz. [62.4.104.109]) by smtp.gmail.com with ESMTPSA id w80sm14742805wme.17.2016.02.08.15.14.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Feb 2016 15:14:59 -0800 (PST) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, stephen@networkplumber.org, Nikolay Aleksandrov Subject: [PATCH iproute2 v2 20/21] iplink: bridge: add support for IFLA_BR_MCAST_STARTUP_QUERY_INTVL Date: Tue, 9 Feb 2016 00:14:38 +0100 Message-Id: <1454973279-9170-21-git-send-email-razor@blackwall.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1454973279-9170-1-git-send-email-razor@blackwall.org> References: <1454973279-9170-1-git-send-email-razor@blackwall.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Nikolay Aleksandrov 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 --- ip/iplink_bridge.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c index 92060eeae1cc..a55a36adacdf 100644 --- 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,