From patchwork Thu Aug 3 15:55:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Fortin X-Patchwork-Id: 797274 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 (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="D/SkmwJS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xNZR13vhsz9s7C for ; Fri, 4 Aug 2017 01:55:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751948AbdHCPzz (ORCPT ); Thu, 3 Aug 2017 11:55:55 -0400 Received: from mail-wr0-f176.google.com ([209.85.128.176]:36065 "EHLO mail-wr0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751925AbdHCPzw (ORCPT ); Thu, 3 Aug 2017 11:55:52 -0400 Received: by mail-wr0-f176.google.com with SMTP id y43so7403002wrd.3 for ; Thu, 03 Aug 2017 08:55:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rUtuPQKterS7+KhwwJWgemFMEs1JdDnWV9kKwuTLP/k=; b=D/SkmwJSn4o1Qcl0YVQNP97zLykyQ4GqvL+uFPbeQE5OKvrxJlpNaAPBw/Gk1TcPfR N+FAJnOc9B2JtbbHzHIohzoUr82zSEwz9cmIMdN1PIGGLb7tzvZVDqX8uX2yCWipABow zmbhKzZSqWopf0bGMHpsgLsIfRaP/2AIgq6tc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rUtuPQKterS7+KhwwJWgemFMEs1JdDnWV9kKwuTLP/k=; b=V12iSRHfF+WYjX0gCt9EhWgDnE7nEPG8mbietZHTrTMXjRAU2b6q0cP5fbUdJkZMMG /auQ7WbKAol4Wc5XrkdJ4gOMj1kTE02y4kQatnwI06/5oiVTb965hHj1u8HogS9uiRPR R8O0rhXOe+c7Fu4ETfD+r04FhMWLEhNPmnWZV10U7YVkXfJ/rtvbVaYR51kWeKMkFAUw JUdhHjoEGg4hj4XA19+QGaO8WPtfq4NjFYCPH4apAC93gw5A4fXXOY929U9sBQa5b97z SoDQlGBZen3LcGMFiyT0XlZRAUkawLtiEt8OKYp8g6PbqZ4QL1VH0CGAosPTEnIfavuR 7H/A== X-Gm-Message-State: AIVw1122WZ4i8gHTnSDdby5MUbVAb+HcsDCSQ5UVnGj+4uGn/+FFdDfX bzNSDm8zMc23+X5qhts= X-Received: by 10.223.142.68 with SMTP id n62mr1902324wrb.27.1501775750559; Thu, 03 Aug 2017 08:55:50 -0700 (PDT) Received: from localhost.localdomain (91-160-18-219.subs.proxad.net. [91.160.18.219]) by smtp.googlemail.com with ESMTPSA id d91sm2213309wma.23.2017.08.03.08.55.49 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 03 Aug 2017 08:55:50 -0700 (PDT) From: Julien Fortin X-Google-Original-From: Julien Fortin To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com, dsa@cumulusnetworks.com, Julien Fortin Subject: [PATCH 15/27] ip: iplink_ipvlan.c: add json output support Date: Thu, 3 Aug 2017 17:55:03 +0200 Message-Id: <20170803155515.99226-16-julien@cumulusnetworks.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170803155515.99226-1-julien@cumulusnetworks.com> References: <20170803155515.99226-1-julien@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Julien Fortin Schema: { "mode": { "type": "string", "attr": "IFLA_IPVLAN_MODE" } } Signed-off-by: Julien Fortin --- ip/iplink_ipvlan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ip/iplink_ipvlan.c b/ip/iplink_ipvlan.c index f7735f3a..9f48309e 100644 --- a/ip/iplink_ipvlan.c +++ b/ip/iplink_ipvlan.c @@ -68,11 +68,11 @@ static void ipvlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) if (tb[IFLA_IPVLAN_MODE]) { if (RTA_PAYLOAD(tb[IFLA_IPVLAN_MODE]) == sizeof(__u16)) { __u16 mode = rta_getattr_u16(tb[IFLA_IPVLAN_MODE]); - - fprintf(f, " mode %s ", - mode == IPVLAN_MODE_L2 ? "l2" : + const char *mode_str = mode == IPVLAN_MODE_L2 ? "l2" : mode == IPVLAN_MODE_L3 ? "l3" : - mode == IPVLAN_MODE_L3S ? "l3s" : "unknown"); + mode == IPVLAN_MODE_L3S ? "l3s" : "unknown"; + + print_string(PRINT_ANY, "mode", " mode %s ", mode_str); } } }