From patchwork Thu Jan 10 03:17:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hangbin Liu X-Patchwork-Id: 1022684 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="L7l8Qj/T"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43ZrmN1Mzdz9sDL for ; Thu, 10 Jan 2019 14:18:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727142AbfAJDSJ (ORCPT ); Wed, 9 Jan 2019 22:18:09 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:40628 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726834AbfAJDSJ (ORCPT ); Wed, 9 Jan 2019 22:18:09 -0500 Received: by mail-pg1-f193.google.com with SMTP id z10so4210404pgp.7 for ; Wed, 09 Jan 2019 19:18:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=C1mwN1On65pkXYjctQnRDk8pIBAN17VUB37hXeQ4lhc=; b=L7l8Qj/TmLhxAeMC6fRLd+z1Zfg2UNc01ZO+mdGeJSG6NaYLMfn4VrRsPnWB1I9Kia HBNF7C3lusWDaoAcXAPHKzzLK7GeeVinhrlzTVmOKy3GGUmbm8RQUrNnZPKypb63vbz7 5fRP4STIa9iU7VM/BbyMZSykGrRQMAlPJsKQZLEdsqj0xpFgCFbz1XHVjzpQQebMjEsv t3cRVVvEkcPpKQNLm29Udbc3cCJv6dEdkPoSKFdsOXsXV7K7VKSLjrt0bQBOhyhNz6Fp q5iuUNyJaIhLvxV47iY5xXLNBqhNX5ob/bFkH3/ScASsRbv3+7YgrzxeAXwB+1oEob76 pMdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=C1mwN1On65pkXYjctQnRDk8pIBAN17VUB37hXeQ4lhc=; b=Z+zUkFECun+ak8M0Atx5hiMYAED+A58f3y7SUaFwdalZcXdA5Q38dmpyI75YFx7s49 zNzlWtqqYLJF6ZIxiU8ZVeoCaEQftIo3LHJ5a62f12xkeVkTBqB/fZP2V0QJHNhLgPd2 d2B1tIMwvfeoi/e/7C+kkWDgZUZnCzqbOLhF0rxJM6JI6RS8TK5IyjP/RGH1JhwricP0 ScaKO4/POnfHS4iHwMEFJTpRiFlG6wHarxFxBzuzr+dCGrFt8/JjEe/V9zHWu52Rrhqa EJHpvirMtFIiSydfLkuxIfbuAapGwvS89cKFmmAs8kCA54IHfD7E8sCglf01ZR+x3kul 044A== X-Gm-Message-State: AJcUukdAN63SqX2Ho0ZW67EobY1YZxuNhOnbhA0/XxKwRngocVIbZGST nyZa5i4nzCVBGZQBIV9zuP89ZszJ X-Google-Smtp-Source: ALg8bN7Ct6E4tUGUdsY61d+B+Dkd+P7urkDUglCrtHlJQpMFTOJ6CJqtK5GvPtsEVsZ0sG/yEBbt1g== X-Received: by 2002:a63:61c8:: with SMTP id v191mr7934191pgb.242.1547090288318; Wed, 09 Jan 2019 19:18:08 -0800 (PST) Received: from dhcp-12-139.nay.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id q1sm110006727pfb.96.2019.01.09.19.18.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Jan 2019 19:18:07 -0800 (PST) From: Hangbin Liu To: netdev@vger.kernel.org Cc: William Tu , "David S . Miller" , Hangbin Liu Subject: [PATCH net] ip6_gre: update version related info when changing link Date: Thu, 10 Jan 2019 11:17:42 +0800 Message-Id: <20190110031742.10834-1-liuhangbin@gmail.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We forgot to update ip6erspan version related info when changing link, which will cause setting new hwid failed. Reported-by: Jianlin Shi Fixes: 94d7d8f292870 ("ip6_gre: add erspan v2 support") Signed-off-by: Hangbin Liu --- net/ipv6/ip6_gre.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 09d0826742f8..5ca0dbc077df 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -1169,6 +1169,10 @@ static void ip6gre_tnl_copy_tnl_parm(struct ip6_tnl *t, t->parms.i_flags = p->i_flags; t->parms.o_flags = p->o_flags; t->parms.fwmark = p->fwmark; + t->parms.erspan_ver = p->erspan_ver; + t->parms.index = p->index; + t->parms.dir = p->dir; + t->parms.hwid = p->hwid; dst_cache_reset(&t->dst_cache); }