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

q_cake: properly print memlimit 

Load memlimit so that it will be printed if it isn't set to zero.

Also add a space to properly print it.

Signed-off-by: Odin Ugedal <odin@ugedal.com>
Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Odin Ugedal 2020-04-15 16:39:35 +02:00 committed by Stephen Hemminger
parent 6f883f168c
commit 14d2df8874
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tc/q_cake.c
View File

@ -520,6 +520,10 @@ static int cake_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
RTA_PAYLOAD(tb[TCA_CAKE_RTT]) >= sizeof(__u32)) { RTA_PAYLOAD(tb[TCA_CAKE_RTT]) >= sizeof(__u32)) {
interval = rta_getattr_u32(tb[TCA_CAKE_RTT]); interval = rta_getattr_u32(tb[TCA_CAKE_RTT]);
} }
if (tb[TCA_CAKE_MEMORY] &&
RTA_PAYLOAD(tb[TCA_CAKE_MEMORY]) >= sizeof(__u32)) {
memlimit = rta_getattr_u32(tb[TCA_CAKE_MEMORY]);
}
if (tb[TCA_CAKE_FWMARK] && if (tb[TCA_CAKE_FWMARK] &&
RTA_PAYLOAD(tb[TCA_CAKE_FWMARK]) >= sizeof(__u32)) { RTA_PAYLOAD(tb[TCA_CAKE_FWMARK]) >= sizeof(__u32)) {
fwmark = rta_getattr_u32(tb[TCA_CAKE_FWMARK]); fwmark = rta_getattr_u32(tb[TCA_CAKE_FWMARK]);
@ -572,7 +576,7 @@ static int cake_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
if (memlimit) { if (memlimit) {
print_uint(PRINT_JSON, "memlimit", NULL, memlimit); print_uint(PRINT_JSON, "memlimit", NULL, memlimit);
print_string(PRINT_FP, NULL, "memlimit %s", print_string(PRINT_FP, NULL, "memlimit %s ",
sprint_size(memlimit, b1)); sprint_size(memlimit, b1));
} }