From: Dmitry Popov Date: Sat, 4 Oct 2014 15:00:25 +0000 (+0400) Subject: ip tunnel: fix 'ip -oneline tunnel show' for some GRE tunnels X-Git-Tag: v3.17.0~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cb8d0307885b57389778c5d8ea6502d54926d44;p=thirdparty%2Fiproute2.git ip tunnel: fix 'ip -oneline tunnel show' for some GRE tunnels 'ip -oneline tunnel show' was not "oneline" for GRE tunnels with iseq: # ip tun add gre_test remote 1.1.1.1 local 2.2.2.2 mode gre iseq oseq # ip -oneline tun show gre_test | wc -l 2 The problem existed because of a typo: '\n' was printed when it shouldn't be. Fixed. Signed-off-by: Dmitry Popov --- diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c index 4b73ec602..b83534ef9 100644 --- a/ip/ip6tunnel.c +++ b/ip/ip6tunnel.c @@ -117,7 +117,7 @@ static void print_tunnel(struct ip6_tnl_parm2 *p) } if (p->i_flags&GRE_SEQ) - printf("%s Drop packets out of sequence.\n", _SL_); + printf("%s Drop packets out of sequence.", _SL_); if (p->i_flags&GRE_CSUM) printf("%s Checksum in received packet is required.", _SL_); if (p->o_flags&GRE_SEQ) diff --git a/ip/iptunnel.c b/ip/iptunnel.c index 0844a4fc9..caf8a28e6 100644 --- a/ip/iptunnel.c +++ b/ip/iptunnel.c @@ -409,7 +409,7 @@ static void print_tunnel(struct ip_tunnel_parm *p) } if (p->i_flags&GRE_SEQ) - printf("%s Drop packets out of sequence.\n", _SL_); + printf("%s Drop packets out of sequence.", _SL_); if (p->i_flags&GRE_CSUM) printf("%s Checksum in received packet is required.", _SL_); if (p->o_flags&GRE_SEQ)