From b76b24006cdbb4c29ad162e61bac720203ac2cda Mon Sep 17 00:00:00 2001 From: Serhey Popovych Date: Wed, 10 Jan 2018 17:53:09 +0200 Subject: [PATCH] ip6/tunnel: Fix tclass output In link_gre6.c it seems copy paste error: tclass is 8 bits, not 20 as flowlabel. In link_iptnl.c rename "flowinfo_tclass" to "tclass" as it correct name since flowinfo is implementation internal name used to label combined within u32 attribute tclass and flowlabel. Fixes: 1facc1c61c07 ("ip: link_ip6tnl.c: add json output support") Fixes: 2e706e12d9b0 ("Merge branch 'master' into net-next") Signed-off-by: Serhey Popovych Signed-off-by: Stephen Hemminger --- ip/link_gre6.c | 2 +- ip/link_ip6tnl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ip/link_gre6.c b/ip/link_gre6.c index 7ae4b492..87c313c2 100644 --- a/ip/link_gre6.c +++ b/ip/link_gre6.c @@ -475,7 +475,7 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) if (is_json_context()) { SPRINT_BUF(b1); - snprintf(b1, sizeof(b1), "0x%05x", + snprintf(b1, sizeof(b1), "0x%02x", ntohl(flowinfo & IP6_FLOWINFO_TCLASS) >> 20); print_string(PRINT_JSON, "tclass", NULL, b1); } else { diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c index 84205b12..8e84ed06 100644 --- a/ip/link_ip6tnl.c +++ b/ip/link_ip6tnl.c @@ -416,7 +416,7 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb SPRINT_BUF(b1); snprintf(b1, sizeof(b1), "0x%02x", (__u8)(val >> 20)); - print_string(PRINT_JSON, "flowinfo_tclass", NULL, b1); + print_string(PRINT_JSON, "tclass", NULL, b1); } else { printf("tclass 0x%02x ", (__u8)(val >> 20)); } -- 2.39.5