From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Jungel Subject: [iproute2 PATCH] bridge: fix vlan show stats formatting Date: Sat, 20 Oct 2018 15:42:33 +0200 Message-ID: <09b37bb3d091567c1f8958994e69e1221a61c0dc.camel@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org To: Stephen Hemminger Return-path: Received: from mail-ed1-f66.google.com ([209.85.208.66]:38940 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727343AbeJTVxI (ORCPT ); Sat, 20 Oct 2018 17:53:08 -0400 Received: by mail-ed1-f66.google.com with SMTP id d15-v6so33876939edq.6 for ; Sat, 20 Oct 2018 06:42:36 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: The output of -statistics vlan show was broken previous change for json output. This aligns the format to vlan show. Signed-off-by: Tobias Jungel --- bridge/vlan.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bridge/vlan.c b/bridge/vlan.c index bdce55ae..85f4a539 100644 --- a/bridge/vlan.c +++ b/bridge/vlan.c @@ -487,8 +487,7 @@ static void print_vlan_stats_attr(struct rtattr *attr, int ifindex) list = brtb[LINK_XSTATS_TYPE_BRIDGE]; rem = RTA_PAYLOAD(list); - ifname = ll_index_to_name(ifindex); - open_json_object(ifname); + open_vlan_port(ifindex); print_color_string(PRINT_FP, COLOR_IFNAME, NULL, "%-16s", ifname); @@ -509,8 +508,7 @@ static void print_vlan_stats_attr(struct rtattr *attr, int ifindex) print_one_vlan_stats(vstats); } - close_json_object(); - + close_vlan_port(); } static int print_vlan_stats(const struct sockaddr_nl *who,