From 7f536df7f30f340eed7c4e3c9fee6c8c1f6d8daa Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Fri, 26 Jan 2018 11:30:35 -0800 Subject: [PATCH 1/3] ip: address: fix stats64 JSON object name The JSON object name for statistics in ip link show is "stats644". Looks like a typo, commit d0e720111aad ("ip: ipaddress.c: add support for json output") contains an example with the expected "stats64" name. The fact that no one has noticed until now is probably an indication that no one is using this object. Hopefully it's not too late to fix this, although IIUC this has already been in 4.13 and 4.14 releases :S Fixes: d0e720111aad ("ip: ipaddress.c: add support for json output") Signed-off-by: Jakub Kicinski Signed-off-by: Stephen Hemminger --- ip/ipaddress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ip/ipaddress.c b/ip/ipaddress.c index c41e24b5..1601264a 100644 --- a/ip/ipaddress.c +++ b/ip/ipaddress.c @@ -598,7 +598,7 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s, const struct rtattr *carrier_changes) { if (is_json_context()) { - open_json_object("stats644"); + open_json_object("stats64"); /* RX stats */ open_json_object("rx"); From 44c76551865efedb07d9f9b2db4103efbcb356a5 Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Sat, 27 Jan 2018 01:19:04 -0800 Subject: [PATCH 2/3] tc: fix second printing of requeues Non-JSON tc qdisc output used to print the "requeues" statistic twice. Commit 4fcec7f3665b ("tc: jsonify stats2") tried to preserve this behaviour for both standard output and JSON, but used the wrong statistic (q.qlen). Also duplicating keys in JSON is not allowed, so the second occurrence should be completely skipped with JSON. Fixes: 4fcec7f3665b ("tc: jsonify stats2") Signed-off-by: Jakub Kicinski Signed-off-by: Stephen Hemminger --- tc/tc_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tc/tc_util.c b/tc/tc_util.c index 10e5aa91..aceb0d94 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -846,7 +846,7 @@ void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtat print_string(PRINT_FP, NULL, "backlog %s", sprint_size(q.backlog, b1)); print_uint(PRINT_ANY, "qlen", " %up", q.qlen); - print_uint(PRINT_ANY, "requeues", " requeues %u", q.qlen); + print_uint(PRINT_FP, NULL, " requeues %u", q.requeues); } if (xstats) From 50b8a842e8c098cddb213f5b3076526df88826e8 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 29 Jan 2018 08:08:52 -0800 Subject: [PATCH 3/3] v4.15.0 --- include/SNAPSHOT.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/SNAPSHOT.h b/include/SNAPSHOT.h index 576b11a6..771bee72 100644 --- a/include/SNAPSHOT.h +++ b/include/SNAPSHOT.h @@ -1 +1 @@ -static const char SNAPSHOT[] = "171113"; +static const char SNAPSHOT[] = "180129";