[PATCH iproute2] tc: fq: fix two issues
From: Eric Dumazet <edumazet@google.com>
Date: 2020-05-05 15:43:55
My latest patch missed the fact that this file got JSON support.
Also fixes a spelling error added during JSON change.
Fixes: be9ca9d54123 ("tc: fq: add timer_slack parameter")
Fixes: d15e2bfc042b ("tc: fq: add support for JSON output")
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
tc/q_fq.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tc/q_fq.c b/tc/q_fq.c
index ffae0523b1abe6a9328c6542160ff938ad666532..98d1bf4014e3f9fbb8e804f92dcdc96e417b5c74 100644
--- a/tc/q_fq.c
+++ b/tc/q_fq.c@@ -379,7 +379,9 @@ static int fq_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) if (tb[TCA_FQ_TIMER_SLACK] && RTA_PAYLOAD(tb[TCA_FQ_TIMER_SLACK]) >= sizeof(__u32)) { timer_slack = rta_getattr_u32(tb[TCA_FQ_TIMER_SLACK]); - fprintf(f, "timer_slack %s ", sprint_time64(timer_slack, b1)); + print_uint(PRINT_JSON, "timer_slack", NULL, timer_slack); + print_string(PRINT_FP, NULL, "timer_slack %s ", + sprint_time64(timer_slack, b1)); } return 0;
@@ -442,7 +444,7 @@ static int fq_print_xstats(struct qdisc_util *qu, FILE *f, print_nl(); print_lluint(PRINT_ANY, "pkts_too_long", " pkts_too_long %llu", st->pkts_too_long); - print_lluint(PRINT_ANY, "alloc_errors", " alloc_erros %llu", + print_lluint(PRINT_ANY, "alloc_errors", " alloc_errors %llu", st->allocation_errors); }
--
2.26.2.526.g744177e7f7-goog