diff options
| author | Odin Ugedal <odin@ugedal.com> | 2020-04-15 16:39:35 +0200 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2020-04-20 09:33:15 -0700 |
| commit | 14d2df887481dd2130c6ae5d023325262429ce3c (patch) | |
| tree | 088f4b0c566cebd411b73871f3f88b819b7764a8 | |
| parent | 6f883f168cf9e1f3be208a10d671a54d781e75a5 (diff) | |
| download | iproute2-14d2df887481dd2130c6ae5d023325262429ce3c.tar.gz | |
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>
| -rw-r--r-- | tc/q_cake.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tc/q_cake.c b/tc/q_cake.c index 9ebb270c1..bf116e803 100644 --- a/tc/q_cake.c +++ b/tc/q_cake.c @@ -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)) { 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] && RTA_PAYLOAD(tb[TCA_CAKE_FWMARK]) >= sizeof(__u32)) { 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) { 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)); } |