From mboxrd@z Thu Jan 1 00:00:00 1970 From: robertshearman@gmail.com Subject: [PATCH iproute2] gre: Fix ttl inherit option Date: Tue, 28 Nov 2017 11:16:21 +0000 Message-ID: <1511867781-11592-1-git-send-email-robertshearman@gmail.com> Cc: Robert Shearman To: stephen@networkplumber.org, netdev@vger.kernel.org Return-path: Received: from mail-yw0-f193.google.com ([209.85.161.193]:33137 "EHLO mail-yw0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755104AbdK1LQi (ORCPT ); Tue, 28 Nov 2017 06:16:38 -0500 Received: by mail-yw0-f193.google.com with SMTP id z125so11669630ywb.0 for ; Tue, 28 Nov 2017 03:16:38 -0800 (PST) Sender: netdev-owner@vger.kernel.org List-ID: From: Robert Shearman Specifying "... ttl inherit" currently does nothing on a GRE link modify since the previous ttl value is retrieved up front. Fix this by explicitly setting ttl to 0 when "inherit" is specified for the option, since 0 represents the semantics of inherit. Signed-off-by: Robert Shearman --- ip/link_gre.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ip/link_gre.c b/ip/link_gre.c index 35782caaa68b..43cb1af6196a 100644 --- a/ip/link_gre.c +++ b/ip/link_gre.c @@ -276,7 +276,8 @@ get_failed: if (uval > 255) invarg("TTL must be <= 255\n", *argv); ttl = uval; - } + } else + ttl = 0; } else if (!matches(*argv, "tos") || !matches(*argv, "tclass") || !matches(*argv, "dsfield")) { -- 2.1.4