From patchwork Mon Feb 8 11:55:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 580260 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 AEB5F1409B7 for ; Mon, 8 Feb 2016 22:57:50 +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=TwZ/ExHS; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752794AbcBHL5r (ORCPT ); Mon, 8 Feb 2016 06:57:47 -0500 Received: from mail-wm0-f53.google.com ([74.125.82.53]:37227 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbcBHL4M (ORCPT ); Mon, 8 Feb 2016 06:56:12 -0500 Received: by mail-wm0-f53.google.com with SMTP id g62so112738745wme.0 for ; Mon, 08 Feb 2016 03:56:11 -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=COSpTpXWYdr+dqEU0QlB6D+n5pd8A7x/U+sHKaLjxdQ=; b=TwZ/ExHSMTMXHrVreLr9sZf0H3cWyzP4QRAFlgyet4ft0mYuiWKhpU1ph1/aNtD7jd wgN2pG699Nvrv2u0O1O/l+G4GIGWM9bZWfYFeNpSMTdUjuYUpWfE3qDQ3imuHDm8qZXY vJy8q3f7OoVZHWfK99lzmtw8HGiaXKAntgYzuOTw1Ml2QFIhsfL6z4dB/a7bDpVR6aIS S03XD24SuvYbqCXSLs54aPXIkiTYLz1dGYtq4EiSdnH9zjSXeQgadYXOq5QM7BOabu9V kUXSxxOm1Cmh+J3UwUEVzaQ2O+Znn25c59WOP7pY5hZYf6Ea7QeQVdqydHhSLygEy30J D53g== 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=COSpTpXWYdr+dqEU0QlB6D+n5pd8A7x/U+sHKaLjxdQ=; b=at2t03s4t/BlgnjJZS2ECoSgU0grbhRTzTzYWXkD1Or/pWd47yxD/0XgbDV4WJEw2R kUpRCreoxbSRRZPhAs3uiRu16HXIgsIrM8WJGtVk3EWgJ/vHYxb7RwvToptAb98aIka5 coBGnQud3IZ+541enBJYN4g+GSEtuVFb5scFj9GJyOHNrdmPLzF88p/hMbwE/JJSpaKz 1q1nQBAXx1k9YfFhN9CbBkZkNDZqLgtrkFVc+TlWFZjCLOwXaJAXNMvbOtOdk6jmJPEl NSVRrRYmaEwo3Ooh4BeTwOjBzPoiIUEh9Ih8mjMuQqRcmTAf1LEkMnp2oPuvajfFYofu St8w== X-Gm-Message-State: AG10YORpuvRqSbOFo4osyEqQEhyq3oy5b/9xPFls2AATS75s0N5DJqMI+06femW3GhukQQ== X-Received: by 10.194.234.41 with SMTP id ub9mr27278397wjc.9.1454932571241; Mon, 08 Feb 2016 03:56:11 -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 q75sm12350824wmd.6.2016.02.08.03.56.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Feb 2016 03:56:10 -0800 (PST) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, stephen@networkplumber.org, Nikolay Aleksandrov Subject: [PATCH iproute2 03/21] iplink: bridge: export read-only timers Date: Mon, 8 Feb 2016 12:55:09 +0100 Message-Id: <1454932527-30569-4-git-send-email-razor@blackwall.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1454932527-30569-1-git-send-email-razor@blackwall.org> References: <1454932527-30569-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 Netlink already provides hello_timer, tcn_timer, topology_change_timer and gc_timer, so let's make them visible. Signed-off-by: Nikolay Aleksandrov --- include/utils.h | 1 - ip/iplink_bridge.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/utils.h b/include/utils.h index 7310f4e0e5db..f109521a904e 100644 --- a/include/utils.h +++ b/include/utils.h @@ -175,7 +175,6 @@ static inline __u32 nl_mgrp(__u32 group) return group ? (1 << (group - 1)) : 0; } - int print_timestamp(FILE *fp); void print_nlmsg_timestamp(FILE *fp, const struct nlmsghdr *n); diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c index d9a725b0be0f..8504be5625fa 100644 --- a/ip/iplink_bridge.c +++ b/ip/iplink_bridge.c @@ -196,6 +196,22 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) if (tb[IFLA_BR_TOPOLOGY_CHANGE_DETECTED]) fprintf(f, "topology_change_detected %u ", rta_getattr_u8(tb[IFLA_BR_TOPOLOGY_CHANGE_DETECTED])); + + if (tb[IFLA_BR_HELLO_TIMER]) + fprintf(f, "hello_timer %llu ", + rta_getattr_u64(tb[IFLA_BR_HELLO_TIMER])); + + if (tb[IFLA_BR_TCN_TIMER]) + fprintf(f, "tcn_timer %llu ", + rta_getattr_u64(tb[IFLA_BR_TCN_TIMER])); + + if (tb[IFLA_BR_TOPOLOGY_CHANGE_TIMER]) + fprintf(f, "topology_change_timer %llu ", + rta_getattr_u64(tb[IFLA_BR_TOPOLOGY_CHANGE_TIMER])); + + if (tb[IFLA_BR_GC_TIMER]) + fprintf(f, "gc_timer %llu ", + rta_getattr_u64(tb[IFLA_BR_GC_TIMER])); } static void bridge_print_help(struct link_util *lu, int argc, char **argv,