matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tc: fix second printing of requeues 

Non-JSON tc qdisc output used to print the "requeues" statistic
twice.  Commit 4fcec7f366 ("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: 4fcec7f366 ("tc: jsonify stats2")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Jakub Kicinski 2018-01-27 01:19:04 -08:00 committed by Stephen Hemminger
parent 7f536df7f3
commit 44c7655186
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tc/tc_util.c
View File

@ -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)