From patchwork Fri Jan 12 17:39:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serhey Popovych X-Patchwork-Id: 860089 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iacWC655"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zJ94R5RnRz9t3G for ; Sat, 13 Jan 2018 04:40:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964939AbeALRkF (ORCPT ); Fri, 12 Jan 2018 12:40:05 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:39177 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964885AbeALRkD (ORCPT ); Fri, 12 Jan 2018 12:40:03 -0500 Received: by mail-lf0-f68.google.com with SMTP id m8so6762799lfc.6 for ; Fri, 12 Jan 2018 09:40:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=hcy39O1Iv2RwIyxs9qfopsifGsxpXVPwlnuDeBJM0J0=; b=iacWC655IhzijENWyQg4sVdiS1GBpuh5LquP6uwjpD1T+a+sobd3xR63jFtmJZLow1 ML1ISGwWBlvO6wBIJkYSs4dewlwiIH/TynByaUvRapllwLC+gFQMnWJPFObiA7pZI/1J 32/dEzFgOfyLKt3Mix+N6Ugb8Ksn/BeSmTLJEZA9J+BdOjHbNQ2Kp+W/7sabPMO1ojit 0y77WR88pu5M3i4e4j5yANA9u6lA8MVszxhQdbwssTy36WVyEFZFQ1jVztSid3lqd8/E C8rzERUb37qE48S0o+nj7eUnc/IXMDQNW0h/uSdo4y9QwQ9m7YCinZwzcb/o18FVNQE6 7nhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=hcy39O1Iv2RwIyxs9qfopsifGsxpXVPwlnuDeBJM0J0=; b=KSLPamyDkmz6QdtL13vu7jIr7Vg8dwIsJvtoo52AC2ID673Oav9DVOGt3lxLSc54Ig 3/ZmU7/Apdz8tKZkSfLUUeKqGevJmQ70UmDvBISJLOCihJlLZH8Ef92CLIWXhsyVa2tt WDcSoizBaJ6VczsqzwacqmThLnmgekXiNJV0hKhWI2TmDDzsvmwzqI5AuB1zNFB+Hik4 JGt/D8fe9y9yYhybPDwnt2t+9Mm8+uXFWijIdNGC8onud1h1kSK/fs5j81ggFPLoPbZI YcGRqk8JvdpJS5y+gjCbKwMHOWup4geF42pnfe0E0DufpFXTufwCYskf09BEQfmo5H9N Jzbg== X-Gm-Message-State: AKwxytfpAxvwrgVqX7tEnRjR7UBi9sjYns1iuR7bzxaEl0jF6FWiG8ux mM2fDbQOei12vmwelIWbXP3ZFQ== X-Google-Smtp-Source: ACJfBotcOM8gtdPy87Z0eNjZ70YK915r7WluHYD1LZ+KF/xw5MOmiS5wtOBcfXHZA0ooQFJpR4RKLg== X-Received: by 10.25.29.15 with SMTP id d15mr13434460lfd.136.1515778801494; Fri, 12 Jan 2018 09:40:01 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id c190sm3781968lfc.81.2018.01.12.09.40.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 09:40:00 -0800 (PST) From: Serhey Popovych To: netdev@vger.kernel.org Subject: [PATCH iproute2 6/9] gre/tunnel: Print erspan_index using print_uint() Date: Fri, 12 Jan 2018 19:39:31 +0200 Message-Id: <1515778774-24173-7-git-send-email-serhe.popovych@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1515778774-24173-1-git-send-email-serhe.popovych@gmail.com> References: <1515778774-24173-1-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org One is missing in JSON output because fprintf() is used instead of print_uint(). Signed-off-by: Serhey Popovych --- ip/link_gre.c | 3 ++- ip/link_gre6.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ip/link_gre.c b/ip/link_gre.c index b70f73b..a7d1cd1 100644 --- a/ip/link_gre.c +++ b/ip/link_gre.c @@ -464,7 +464,8 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) if (tb[IFLA_GRE_ERSPAN_INDEX]) { __u32 erspan_idx = rta_getattr_u32(tb[IFLA_GRE_ERSPAN_INDEX]); - fprintf(f, "erspan_index %u ", erspan_idx); + print_uint(PRINT_ANY, + "erspan_index", "erspan_index %u ", erspan_idx); } if (tb[IFLA_GRE_ENCAP_TYPE] && diff --git a/ip/link_gre6.c b/ip/link_gre6.c index 41180bb..200846e 100644 --- a/ip/link_gre6.c +++ b/ip/link_gre6.c @@ -512,7 +512,9 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) if (tb[IFLA_GRE_ERSPAN_INDEX]) { __u32 erspan_idx = rta_getattr_u32(tb[IFLA_GRE_ERSPAN_INDEX]); - fprintf(f, "erspan_index %u ", erspan_idx); + + print_uint(PRINT_ANY, + "erspan_index", "erspan_index %u ", erspan_idx); } if (tb[IFLA_GRE_ENCAP_TYPE] &&