From: Serhey Popovych <serhe.popovych@gmail.com>
To: netdev@vger.kernel.org
Subject: [PATCH iproute2 7/7] ip6tnl/tunnel: Output hoplimit before encapsulation limit
Date: Mon, 8 Jan 2018 19:06:38 +0200 [thread overview]
Message-ID: <1515431198-29362-8-git-send-email-serhe.popovych@gmail.com> (raw)
In-Reply-To: <1515431198-29362-1-git-send-email-serhe.popovych@gmail.com>
To follow gre6 output print hoplimit before encapsulation
limit in link_ip6tnl.c.
Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
---
ip/link_ip6tnl.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c
index 379eb33..bbc7878 100644
--- a/ip/link_ip6tnl.c
+++ b/ip/link_ip6tnl.c
@@ -387,6 +387,13 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb
print_uint(PRINT_ANY, "link_index", "dev %u ", link);
}
+ if (tb[IFLA_IPTUN_TTL]) {
+ print_uint(PRINT_ANY,
+ "ttl",
+ "hoplimit %u ",
+ rta_getattr_u8(tb[IFLA_IPTUN_TTL]));
+ }
+
if (flags & IP6_TNL_F_IGN_ENCAP_LIMIT) {
print_bool(PRINT_ANY,
"ip6_tnl_f_ign_encap_limit",
@@ -398,12 +405,6 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb
print_uint(PRINT_ANY, "encap_limit", "encaplimit %u ", val);
}
- if (tb[IFLA_IPTUN_TTL])
- print_uint(PRINT_ANY,
- "ttl",
- "hoplimit %u ",
- rta_getattr_u8(tb[IFLA_IPTUN_TTL]));
-
if (flags & IP6_TNL_F_USE_ORIG_TCLASS) {
print_bool(PRINT_ANY,
"ip6_tnl_f_use_orig_tclass",
--
1.7.10.4
next prev parent reply other threads:[~2018-01-08 17:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-08 17:06 [PATCH iproute2 0/7] ip6/tunnel: Unify tclass, flowlabel and encap_limit output Serhey Popovych
2018-01-08 17:06 ` [PATCH iproute2 1/7] ip6/tunnel: Fix tclass output Serhey Popovych
2018-01-08 17:06 ` [PATCH iproute2 2/7] ip6tnl/tunnel: Do not print obscure flowinfo Serhey Popovych
2018-01-08 17:06 ` [PATCH iproute2 3/7] ip6/tunnel: Unify tclass printing Serhey Popovych
2018-01-08 17:06 ` [PATCH iproute2 4/7] ip6/tunnel: Unify flowlabel printing Serhey Popovych
2018-01-08 17:06 ` [PATCH iproute2 5/7] ip6/tunnel: Unify encap_limit printing Serhey Popovych
2018-01-08 17:06 ` [PATCH iproute2 6/7] gre6/tunnel: Output flowlabel after tclass Serhey Popovych
2018-01-08 17:06 ` Serhey Popovych [this message]
2018-01-09 16:12 ` [PATCH iproute2 0/7] ip6/tunnel: Unify tclass, flowlabel and encap_limit output Stephen Hemminger
2018-01-10 15:35 ` Serhey Popovych
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1515431198-29362-8-git-send-email-serhe.popovych@gmail.com \
--to=serhe.popovych@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).