From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Wed, 14 Jun 2017 16:45:42 +0000 (+0200)
Subject: link_gre6: really support encaplimit option
X-Git-Tag: v4.12.0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a11b7b71a6eba4ee80e931e4f75321a0cf0116f1;p=thirdparty%2Fiproute2.git

link_gre6: really support encaplimit option

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>
---

diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index 205bada78..4d3d4b542 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++;