From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: Re: [PATCH iproute2] tc: fix second printing of requeues Date: Sat, 27 Jan 2018 16:08:33 -0800 Message-ID: <20180127160833.3980cd52@xeon-e3> References: <20180127091904.6772-1-jakub.kicinski@netronome.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: dsahern@gmail.com, jiri@resnulli.us, netdev@vger.kernel.org, oss-drivers@netronome.com To: Jakub Kicinski Return-path: Received: from mail-pl0-f53.google.com ([209.85.160.53]:45725 "EHLO mail-pl0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751718AbeA1AIg (ORCPT ); Sat, 27 Jan 2018 19:08:36 -0500 Received: by mail-pl0-f53.google.com with SMTP id p5so1177199plo.12 for ; Sat, 27 Jan 2018 16:08:36 -0800 (PST) In-Reply-To: <20180127091904.6772-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org List-ID: On Sat, 27 Jan 2018 01:19:04 -0800 Jakub Kicinski wrote: > Non-JSON tc qdisc output used to print the "requeues" statistic > twice. Commit 4fcec7f3665b ("tc: jsonify stats2") tried to preserve > this behaviour for both standard output and JSON, but used the wrong > statistic (q.qlen). Also duplicating keys in JSON is not allowed, > so the second occurrence should be completely skipped with JSON. > > Fixes: 4fcec7f3665b ("tc: jsonify stats2") > Signed-off-by: Jakub Kicinski Also applied this fix