proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-04 23:36:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tc: fq: fix two issues

Browse Source 
My latest patch missed the fact that this file got JSON support.

Also fixes a spelling error added during JSON change.

Fixes: be9ca9d541 ("tc: fq: add timer_slack parameter")
Fixes: d15e2bfc04 ("tc: fq: add support for JSON output")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Eric Dumazet 2020-05-05 08:43:48 -07:00 committed by Stephen Hemminger
parent 8142c76232
commit 0ecb90b33c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tc/q_fq.c
View File

@ -379,7 +379,9 @@ static int fq_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
if (tb[TCA_FQ_TIMER_SLACK] && if (tb[TCA_FQ_TIMER_SLACK] &&
RTA_PAYLOAD(tb[TCA_FQ_TIMER_SLACK]) >= sizeof(__u32)) { RTA_PAYLOAD(tb[TCA_FQ_TIMER_SLACK]) >= sizeof(__u32)) {
timer_slack = rta_getattr_u32(tb[TCA_FQ_TIMER_SLACK]); 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; return 0;
@ -442,7 +444,7 @@ static int fq_print_xstats(struct qdisc_util *qu, FILE *f,
print_nl(); print_nl();
print_lluint(PRINT_ANY, "pkts_too_long", print_lluint(PRINT_ANY, "pkts_too_long",
" pkts_too_long %llu", st->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); st->allocation_errors);
} }