From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f68.google.com ([209.85.160.68]:43060 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751193AbeCIPfN (ORCPT ); Fri, 9 Mar 2018 10:35:13 -0500 Received: by mail-pl0-f68.google.com with SMTP id f23-v6so5414318plr.10 for ; Fri, 09 Mar 2018 07:35:12 -0800 (PST) Received: from sc9-mailhost3.vmware.com ([24.5.191.4]) by smtp.gmail.com with ESMTPSA id q20sm3283443pgc.84.2018.03.09.07.35.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 07:35:11 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Subject: [PATCH net 1/3] ip6gre: add erspan v2 to tunnel lookup Date: Fri, 9 Mar 2018 07:34:40 -0800 Message-Id: <1520609682-101077-2-git-send-email-u9012063@gmail.com> In-Reply-To: <1520609682-101077-1-git-send-email-u9012063@gmail.com> References: <1520609682-101077-1-git-send-email-u9012063@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: The patch adds the erspan v2 proto in ip6gre_tunnel_lookup so the erspan v2 tunnel can be found correctly. Signed-off-by: William Tu --- net/ipv6/ip6_gre.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 18a3dfbd0300..a056c2bb4b9a 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -126,7 +126,8 @@ static struct ip6_tnl *ip6gre_tunnel_lookup(struct net_device *dev, struct ip6_tnl *t, *cand = NULL; struct ip6gre_net *ign = net_generic(net, ip6gre_net_id); int dev_type = (gre_proto == htons(ETH_P_TEB) || - gre_proto == htons(ETH_P_ERSPAN)) ? + gre_proto == htons(ETH_P_ERSPAN) || + gre_proto == htons(ETH_P_ERSPAN2)) ? ARPHRD_ETHER : ARPHRD_IP6GRE; int score, cand_score = 4; -- 2.7.4