@@ -433,18 +433,15 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
print_int(PRINT_JSON, "ttl", NULL, ttl);
}
- if (flags & IP6_TNL_F_IGN_ENCAP_LIMIT)
+ if (flags & IP6_TNL_F_IGN_ENCAP_LIMIT) {
print_bool(PRINT_ANY,
"ip6_tnl_f_ign_encap_limit",
"encaplimit none ",
true);
- else if (tb[IFLA_GRE_ENCAP_LIMIT]) {
- int encap_limit = rta_getattr_u8(tb[IFLA_GRE_ENCAP_LIMIT]);
+ } else if (tb[IFLA_GRE_ENCAP_LIMIT]) {
+ __u8 val = rta_getattr_u8(tb[IFLA_GRE_ENCAP_LIMIT]);
- print_int(PRINT_ANY,
- "encap_limit",
- "encaplimit %d ",
- encap_limit);
+ print_uint(PRINT_ANY, "encap_limit", "encaplimit %u ", val);
}
if (flags & IP6_TNL_F_USE_ORIG_FLOWLABEL) {
@@ -387,16 +387,16 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb
print_uint(PRINT_ANY, "link_index", "dev %u ", link);
}
- if (flags & IP6_TNL_F_IGN_ENCAP_LIMIT)
+ if (flags & IP6_TNL_F_IGN_ENCAP_LIMIT) {
print_bool(PRINT_ANY,
"ip6_tnl_f_ign_encap_limit",
"encaplimit none ",
true);
- else if (tb[IFLA_IPTUN_ENCAP_LIMIT])
- print_uint(PRINT_ANY,
- "encap_limit",
- "encaplimit %u ",
- rta_getattr_u8(tb[IFLA_IPTUN_ENCAP_LIMIT]));
+ } else if (tb[IFLA_IPTUN_ENCAP_LIMIT]) {
+ __u8 val = rta_getattr_u8(tb[IFLA_IPTUN_ENCAP_LIMIT]);
+
+ print_uint(PRINT_ANY, "encap_limit", "encaplimit %u ", val);
+ }
if (tb[IFLA_IPTUN_TTL])
print_uint(PRINT_ANY,
Use %u format specifier to print it in link_gre6.c and make code more readable. Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> --- ip/link_gre6.c | 11 ++++------- ip/link_ip6tnl.c | 12 ++++++------ 2 files changed, 10 insertions(+), 13 deletions(-)