From patchwork Fri Oct 5 00:08:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 979256 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="gIArv0Wy"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42R98b6mYwz9s8J for ; Fri, 5 Oct 2018 10:08:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727354AbeJEHEo (ORCPT ); Fri, 5 Oct 2018 03:04:44 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:33233 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727215AbeJEHEo (ORCPT ); Fri, 5 Oct 2018 03:04:44 -0400 Received: by mail-qk1-f195.google.com with SMTP id 84-v6so6936878qkf.0 for ; Thu, 04 Oct 2018 17:08:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=iwfMVxaA6w6NwOGqoDTqTj4r14RtYeYFOu3K1bDQYU4=; b=gIArv0WymzKbgNxwM02X8+Qt434riKDr8p6azGHOl5Ao4ojfk3x8l//UbNH7Hpomt2 DbMa/xD6v0nytZyhX8Zj/t7uFRf0llNXVw2UcpJampTIeNBUADHREzbdNgcE5u3ERhSe icbKvcYTeF9xmHCusgSQG0eQ6wLLwXdK1wK2cEKAKMKp5E7QMlFmksmPQc1zA36KVH1y 4dUhsCG7KgKPPv5UXd8UEKfa97OlZ5PGsnngcj2eVxxLYY/R1EGTSUjwJeTtoGdt+6UT enb/Tcb8e5S+BBUPaTALBpOGEdtEfUkBAwZbaI1i3QTzD8/pAhDLNd9Ei/1Up857OETW ZTpA== 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; bh=iwfMVxaA6w6NwOGqoDTqTj4r14RtYeYFOu3K1bDQYU4=; b=OaGcftUEwsZVJ3xXFENydte9xwODWKhhaqWsFC/ha0fohmPRkVnX5u5R5xHDWC7+ww NuMoxdjNJp8PDLp8ELMv8A6W4mD/p9Hk0knhzyrz3RcC6yRXrvgHeLQhNqT/Y16HA/Hr 9UxRX9rVHRzre2CF4pEhO44nnCPRmoiBwl9BrV8aZzI9Dy96a+ddnF2qZuLm6f3qlMdW XCrYrFwO2j0A6dm94o10NsL14Q0L+ZvjpQxBP7qfr+IjAePYw1nO9EKhMyA9lz8Wm7n6 kZ620zeOHO75rT/uSilu5is9gxFK+riw8bCUNXvj2+HhyeOAhOb0VBXBCKTCZQ862IRe jutw== X-Gm-Message-State: ABuFfogEIWeynC/GuwbWFLyRQPUjgRZHhs/vNaTy7BHZ8tkh2wydbSvq Y1hQRbQoftrE0JqoeXjY0meuPQHGUKQ= X-Google-Smtp-Source: ACcGV61RiQa5hhn4qQA0vm4pYsn27lwLQviDML9Hq51y9GR1RQq/qymddfYeWqrWPMxWg95atF3eeg== X-Received: by 2002:a37:1a59:: with SMTP id a86-v6mr7183455qka.191.1538698125641; Thu, 04 Oct 2018 17:08:45 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id f48-v6sm3690533qte.17.2018.10.04.17.08.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Oct 2018 17:08:45 -0700 (PDT) From: Jakub Kicinski To: dsahern@gmail.com Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH iproute2-next] tc: jsonify output of q_fifo Date: Thu, 4 Oct 2018 17:08:34 -0700 Message-Id: <20181005000834.24364-1-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Print limits correctly in JSON context. Signed-off-by: Jakub Kicinski --- tc/q_fifo.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tc/q_fifo.c b/tc/q_fifo.c index cb86a404d4de..61493fbbc5bc 100644 --- a/tc/q_fifo.c +++ b/tc/q_fifo.c @@ -69,9 +69,12 @@ static int fifo_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) qopt = RTA_DATA(opt); if (strcmp(qu->id, "bfifo") == 0) { SPRINT_BUF(b1); - fprintf(f, "limit %s", sprint_size(qopt->limit, b1)); - } else - fprintf(f, "limit %up", qopt->limit); + print_uint(PRINT_JSON, "limit", NULL, qopt->limit); + print_string(PRINT_FP, NULL, "limit %s", + sprint_size(qopt->limit, b1)); + } else { + print_uint(PRINT_ANY, "limit", "limit %up", qopt->limit); + } return 0; }