Skip to contentSkip to conversation

tc: add a missing space between rate estimator and backlog

PATCH Applied Eric Dumazet 3 participants 3 messages Dec 1, 2018 – Dec 3, 2018

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Eric Dumazet

author
#0 lore raw

PATCH 1/1 tc: add a missing space between rate estimator and backlog

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 <[email protected]>
Cc Jiri Pirko <[email protected]>
---
 tc/tc_util.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tc/tc_util.c +2 -1
index 82856a85170b6fdb2dfab42a8487882afbf6c93d..ab717890bb2a44b4c53a756bd8350b4ed4428a22 100644
@@ -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);
Signature · 1 line
2.20.0.rc1.387.gf8505762e3-goog