From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: Re: [PATCH iproute2-next] tc: jsonify output of q_fifo Date: Thu, 4 Oct 2018 17:10:58 -0700 Message-ID: <20181004171058.0bd85fdb@xeon-e3> References: <20181005000834.24364-1-jakub.kicinski@netronome.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: dsahern@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com To: Jakub Kicinski Return-path: Received: from mail-pl1-f195.google.com ([209.85.214.195]:43432 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725998AbeJEHHA (ORCPT ); Fri, 5 Oct 2018 03:07:00 -0400 Received: by mail-pl1-f195.google.com with SMTP id 30-v6so5952384plb.10 for ; Thu, 04 Oct 2018 17:11:01 -0700 (PDT) In-Reply-To: <20181005000834.24364-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org List-ID: On Thu, 4 Oct 2018 17:08:34 -0700 Jakub Kicinski wrote: > 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; > } > This can go to current not net-next, since it is a bug fix really.