]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
tc: add a missing space between rate estimator and backlog
authorEric Dumazet <edumazet@google.com>
Fri, 30 Nov 2018 13:57:02 +0000 (05:57 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Mon, 3 Dec 2018 22:34:05 +0000 (14:34 -0800)
When a rate estimator is active, "tc -s qd" displays
something like :

rate 12616bit 11ppsbacklog 0b 0p requeues 2

instead of :

rate 12616bit 11pps backlog 0b 0p requeues 2

Fixes: 4fcec7f3665b ("tc: jsonify stats2")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
tc/tc_util.c

index 82856a85170b6fdb2dfab42a8487882afbf6c93d..ab717890bb2a44b4c53a756bd8350b4ed4428a22 100644 (file)
@@ -838,8 +838,9 @@ void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtat
 
                memcpy(&q, RTA_DATA(tbs[TCA_STATS_QUEUE]), MIN(RTA_PAYLOAD(tbs[TCA_STATS_QUEUE]), sizeof(q)));
                if (!tbs[TCA_STATS_RATE_EST])
-                       print_string(PRINT_FP, NULL, "\n%s", prefix);
+                       print_string(PRINT_FP, NULL, "\n", "");
                print_uint(PRINT_JSON, "backlog", NULL, q.backlog);
+               print_string(PRINT_FP, NULL, "%s", prefix);
                print_string(PRINT_FP, NULL, "backlog %s",
                             sprint_size(q.backlog, b1));
                print_uint(PRINT_ANY, "qlen", " %up", q.qlen);