]> git.ipfire.org Git - thirdparty/iproute2.git/commit
tc: fix second printing of requeues
authorJakub Kicinski <jakub.kicinski@netronome.com>
Sat, 27 Jan 2018 09:19:04 +0000 (01:19 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Sun, 28 Jan 2018 00:06:54 +0000 (16:06 -0800)
commit44c76551865efedb07d9f9b2db4103efbcb356a5
tree1c678665f4569ba93c51804f0b2b664873c7703d
parent7f536df7f30f340eed7c4e3c9fee6c8c1f6d8daa
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 <jakub.kicinski@netronome.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
tc/tc_util.c