From 3e679f946a6313983ca544a28ce0ccf0072962e5 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 25 Oct 2018 12:22:23 +0200 Subject: [PATCH] tc: htb: Print default value in hex Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1641053 Upstream Status: iproute2.git commit 737b8258b35f4 commit 737b8258b35f4cc643a8153fdf955bfa0adec30f Author: Phil Sutter Date: Tue Oct 23 12:36:24 2018 +0200 tc: htb: Print default value in hex Value of 'default' is assumed to be hexadecimal when parsing, so consequently it should be printed in hex as well. This is a regression introduced when adding JSON output. As requested, also change JSON output to print the value as hex string. Fixes: f354fa6aa5ff0 ("tc: jsonify htb qdisc") Signed-off-by: Phil Sutter Signed-off-by: Stephen Hemminger --- tc/q_htb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tc/q_htb.c b/tc/q_htb.c index b93d31d..cce9ebc 100644 --- a/tc/q_htb.c +++ b/tc/q_htb.c @@ -341,7 +341,7 @@ static int htb_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) if (RTA_PAYLOAD(tb[TCA_HTB_INIT]) < sizeof(*gopt)) return -1; print_int(PRINT_ANY, "r2q", "r2q %d", gopt->rate2quantum); - print_uint(PRINT_ANY, "default", " default %u", gopt->defcls); + print_0xhex(PRINT_ANY, "default", " default %x", gopt->defcls); print_uint(PRINT_ANY, "direct_packets_stat", " direct_packets_stat %u", gopt->direct_pkts); if (show_details) { -- 1.8.3.1