q_cake: Fix incorrect printing of signed values in class statistics

The deficit returned from the kernel is signed, but was printed with a %u
specifier in the format string, leading to negative values to be printed as
high unsigned values instead. In addition, we passed a negative value to
sprint_time() even though that expects an unsigned value. Fix this by
changing the format specifier and reversing the sign of negative time
values.

Fixes: 714444c0cb26 ("Add support for CAKE qdisc")
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/tc/q_cake.c b/tc/q_cake.c
index b7da731b5510873ef0ccd3c6c18eab340912c65c..4ff6056a1ab0ea28a9106b9a2f8077bef31dc085 100644 (file)
--- a/tc/q_cake.c
+++ b/tc/q_cake.c
@@ -675,7 +675,7 @@ static int cake_print_xstats(struct qdisc_util *qu, FILE *f,
 
        /* class stats */
        if (st[TCA_CAKE_STATS_DEFICIT])
-               print_int(PRINT_ANY, "deficit", "  deficit %u",
+               print_int(PRINT_ANY, "deficit", "  deficit %d",
                          GET_STAT_S32(DEFICIT));
        if (st[TCA_CAKE_STATS_COBALT_COUNT])
                print_uint(PRINT_ANY, "count", " count %u",
@@ -688,7 +688,7 @@ static int cake_print_xstats(struct qdisc_util *qu, FILE *f,
 
                        if (drop_next < 0) {
                                print_string(PRINT_FP, NULL, " drop_next -%s",
-                                       sprint_time(drop_next, b1));
+                                       sprint_time(-drop_next, b1));
                        } else {
                                print_uint(PRINT_JSON, "drop_next", NULL,
                                        drop_next);