Merge branch 'iproute2-master' into iproute2-next

[mirror_iproute2.git] / ip / link_gre6.c

diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index 5f465fef3f6f317a79a8bf40cc884622965b0aeb..bb196494cde65edeba940dcf9db8c3b3d57928b5 100644 (file)
--- a/ip/link_gre6.c
+++ b/ip/link_gre6.c
@@ -251,20 +251,21 @@ get_failed:
                        memcpy(&laddr, &addr.data, sizeof(laddr));
                } else if (!matches(*argv, "dev")) {
                        NEXT_ARG();
-                       link = if_nametoindex(*argv);
+                       link = ll_name_to_index(*argv);
                        if (link == 0) {
                                fprintf(stderr, "Cannot find device \"%s\"\n",
                                        *argv);
                                exit(-1);
                        }
                } else if (!matches(*argv, "ttl") ||
-                          !matches(*argv, "hoplimit")) {
-                       __u8 uval;
-
+                          !matches(*argv, "hoplimit") ||
+                          !matches(*argv, "hlim")) {
                        NEXT_ARG();
-                       if (get_u8(&uval, *argv, 0))
-                               invarg("invalid TTL", *argv);
-                       hop_limit = uval;
+                       if (strcmp(*argv, "inherit") != 0) {
+                               if (get_u8(&hop_limit, *argv, 0))
+                                       invarg("invalid HLIM\n", *argv);
+                       } else
+                               hop_limit = 0;
                } else if (!matches(*argv, "tos") ||
                           !matches(*argv, "tclass") ||
                           !matches(*argv, "dsfield")) {