From: Jakub Kicinski Date: Sat, 27 Jan 2018 09:19:04 +0000 (-0800) Subject: tc: fix second printing of requeues X-Git-Tag: v4.15.0~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44c76551865efedb07d9f9b2db4103efbcb356a5;p=thirdparty%2Fiproute2.git tc: fix second printing of requeues 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 Signed-off-by: Stephen Hemminger --- diff --git a/tc/tc_util.c b/tc/tc_util.c index 10e5aa911..aceb0d944 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -846,7 +846,7 @@ void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtat print_string(PRINT_FP, NULL, "backlog %s", sprint_size(q.backlog, b1)); print_uint(PRINT_ANY, "qlen", " %up", q.qlen); - print_uint(PRINT_ANY, "requeues", " requeues %u", q.qlen); + print_uint(PRINT_FP, NULL, " requeues %u", q.requeues); } if (xstats)