From: Leslie Monis Date: Wed, 25 Dec 2019 19:04:18 +0000 (+0530) Subject: tc: fq_codel: fix missing statistic in JSON output X-Git-Tag: v5.5.0~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e819d3a03dd19ed3dd0f50bd128f62f972e8240f;p=thirdparty%2Fiproute2.git tc: fq_codel: fix missing statistic in JSON output Print JSON object even if tc_fq_codel_xstats->class_stats.drop_next is negative. Cc: Toke Høiland-Jørgensen Fixes: 997f2dc19378 ("tc: Add JSON output of fq_codel stats") Signed-off-by: Leslie Monis Signed-off-by: Stephen Hemminger --- diff --git a/tc/q_fq_codel.c b/tc/q_fq_codel.c index 376ac50da..d002940da 100644 --- a/tc/q_fq_codel.c +++ b/tc/q_fq_codel.c @@ -275,12 +275,12 @@ static int fq_codel_print_xstats(struct qdisc_util *qu, FILE *f, sprint_time(st->class_stats.ldelay, b1)); if (st->class_stats.dropping) { print_bool(PRINT_ANY, "dropping", " dropping", true); + print_int(PRINT_JSON, "drop_next", NULL, + st->class_stats.drop_next); if (st->class_stats.drop_next < 0) print_string(PRINT_FP, NULL, " drop_next -%s", sprint_time(-st->class_stats.drop_next, b1)); else { - print_uint(PRINT_JSON, "drop_next", NULL, - st->class_stats.drop_next); print_string(PRINT_FP, NULL, " drop_next %s", sprint_time(st->class_stats.drop_next, b1)); }