| Message ID | 1497458742-6068-1-git-send-email-nicolas.dichtel@6wind.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
On Wed, 14 Jun 2017 18:45:42 +0200 Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > This option is documented in gre6 help, but was not supported. > > Fixes: af89576d7a8c ("iproute2: GRE over IPv6 tunnel support.") > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Sure applied.
Le 14/06/2017 à 22:31, Stephen Hemminger a écrit : > On Wed, 14 Jun 2017 18:45:42 +0200 > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > >> This option is documented in gre6 help, but was not supported. >> >> Fixes: af89576d7a8c ("iproute2: GRE over IPv6 tunnel support.") >> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > > Sure applied. > Thank you. It seems that your iproute2 tree on kernel.org is not up to date, the last patch has been pushed one week ago. Regards, Nicolas
On Thu, 15 Jun 2017 09:28:46 +0200 Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > Le 14/06/2017 à 22:31, Stephen Hemminger a écrit : > > On Wed, 14 Jun 2017 18:45:42 +0200 > > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > > > >> This option is documented in gre6 help, but was not supported. > >> > >> Fixes: af89576d7a8c ("iproute2: GRE over IPv6 tunnel support.") > >> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > > > > Sure applied. > > > Thank you. It seems that your iproute2 tree on kernel.org is not up to date, the > last patch has been pushed one week ago. > Updated. Wanted to put in extended ack support but holding off until for a good test case.
diff --git a/ip/link_gre6.c b/ip/link_gre6.c index 205bada78054..4d3d4b54210b 100644 --- a/ip/link_gre6.c +++ b/ip/link_gre6.c @@ -355,6 +355,18 @@ get_failed: invarg("invalid fwmark\n", *argv); flags &= ~IP6_TNL_F_USE_ORIG_FWMARK; } + } else if (strcmp(*argv, "encaplimit") == 0) { + NEXT_ARG(); + if (strcmp(*argv, "none") == 0) { + flags |= IP6_TNL_F_IGN_ENCAP_LIMIT; + } else { + __u8 uval; + + if (get_u8(&uval, *argv, 0) < -1) + invarg("invalid ELIM", *argv); + encap_limit = uval; + flags &= ~IP6_TNL_F_IGN_ENCAP_LIMIT; + } } else usage(); argc--; argv++;
This option is documented in gre6 help, but was not supported. Fixes: af89576d7a8c ("iproute2: GRE over IPv6 tunnel support.") Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- ip/link_gre6.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)