From patchwork Wed Nov 14 15:29:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 198945 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 540FD2C0091 for ; Thu, 15 Nov 2012 02:28:47 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964800Ab2KNP2j (ORCPT ); Wed, 14 Nov 2012 10:28:39 -0500 Received: from 33.106-14-84.ripe.coltfrance.com ([84.14.106.33]:34811 "EHLO proxy.6wind.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932701Ab2KNP2i (ORCPT ); Wed, 14 Nov 2012 10:28:38 -0500 Received: from schnaps.dev.6wind.com (unknown [10.16.0.249]) by proxy.6wind.com (Postfix) with ESMTPS id 066D95A51F; Wed, 14 Nov 2012 16:28:36 +0100 (CET) Received: from root by schnaps.dev.6wind.com with local (Exim 4.80) (envelope-from ) id 1TYeuD-0003Na-Sp; Wed, 14 Nov 2012 16:29:33 +0100 From: Nicolas Dichtel To: shemminger@vyatta.com Cc: netdev@vger.kernel.org, Nicolas Dichtel Subject: [PATCH iproute2 2/3] ip/ip6tunnel: reset encap limit flag on change Date: Wed, 14 Nov 2012 16:29:25 +0100 Message-Id: <1352906966-12932-2-git-send-email-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1352906966-12932-1-git-send-email-nicolas.dichtel@6wind.com> References: <1352906966-12932-1-git-send-email-nicolas.dichtel@6wind.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Flag IP6_TNL_F_IGN_ENCAP_LIMIT is set when encaplimit is none, but it was not removed if encaplimit was set on update (ip tunnel change). Signed-off-by: Nicolas Dichtel --- ip/ip6tunnel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c index b23377a..7aaac61 100644 --- a/ip/ip6tunnel.c +++ b/ip/ip6tunnel.c @@ -157,6 +157,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm *p) if (get_u8(&uval, *argv, 0) < -1) invarg("invalid ELIM", *argv); p->encap_limit = uval; + p->flags &= ~IP6_TNL_F_IGN_ENCAP_LIMIT; } } else if (strcmp(*argv, "hoplimit") == 0 || strcmp(*argv, "ttl") == 0 ||