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 <serhe.popovych@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index 7ae4b4924433fac408dece8e3676039563a726b9..87c313c205849dc3d13891273b8d75ab392fcd06 100644 (file)
--- 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 84205b1204ccbfd15a7d7e85aa58f923f00a4166..8e84ed06362302eeef1751b53c12a2ebd981a1a2 100644 (file)
--- 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));
                }