From patchwork Sat May 19 00:49:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 916716 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tsc2ELEn"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40nn2G1nZ5z9s52 for ; Sat, 19 May 2018 11:07:18 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E72EAEB1; Sat, 19 May 2018 00:51:00 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 8613CDA1 for ; Sat, 19 May 2018 00:50:27 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 029036CE for ; Sat, 19 May 2018 00:50:26 +0000 (UTC) Received: by mail-pl0-f65.google.com with SMTP id n10-v6so5508007plp.0 for ; Fri, 18 May 2018 17:50:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UU1RXYZ2uh97/O9sN4ItEWlkcFT7J3HGaVr9SSa3hu4=; b=tsc2ELEnGS8f3K/JVu2jTpFBYqxsWReCZ3U6IJGE7ZCuiJaMKp4fzWB6qITiPJrHzv liVZYhnbY7+JICIlWbuu6isOU2lFA/UdutkPBLfTsPYNMX+Zml8kDr9+cPlsuYF2FXGj eQT4GhZBmC09TLaqvTULyK1WnsosLdLPdpETbwdl2pvnaGhwiV5ceh49ZHj3OJ1ENgfQ oR9wR40kGaETCxCmXMx0ckvF9ZRHoK+rDhF4T2hsgFLeXJg/F5ksVa5Bo4czQvoZYcbS 2lPnFhxj8DbNChAVMbErGlbzXODRYLlMXpSkI4pl8OpGU1oun45InCzFMsoepT7Zvadj jTIg== 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:in-reply-to :references; bh=UU1RXYZ2uh97/O9sN4ItEWlkcFT7J3HGaVr9SSa3hu4=; b=RIjQ7M+/9IsG0nZnLj03PvY4/FBTIgDl5bBKBnwPDsMXv/BVbjVbLrLHcFpOKdcJjE t1Wcf9NEFWGgM05juDzFYDCmUlmnrrZFRU0MX0sjBOfwaMXhTS+2oj6bQrJvw/5v8mdB cp5QJVi4dbyPAYqPcpLzI+Cl/JphaGevWmGDPRcNfqw4d4vEeuHKR7YMJ6ym1pkvV1Pu xwXDZBEr7og3UsK7AxhtV53t7T3mmaJ92D6PBpnArpJvZEEUnYdwtRPwpuCNg5K4277G apeA6+bjx86eLR/bXxXq+YglIhTovgdvY86I/b8YHp8xhQh/Lje5532dhlIvepzpk+fW gd/Q== X-Gm-Message-State: ALKqPwfVFDkSuzTHqu+JmmUGR7DC7DRsRp1UCs5G9kZidw5cROifAl4g Onxz4tO24kFgxNLUkg01PLFbxg== X-Google-Smtp-Source: AB8JxZrZLCrOYWym5GjTbr5lyKzLlJ4ZUl1s4Q3IDFPYIln6ib2NqX5drQSvt1uGFC8LmlbRdcd6kw== X-Received: by 2002:a17:902:41:: with SMTP id 59-v6mr11682621pla.345.1526691026380; Fri, 18 May 2018 17:50:26 -0700 (PDT) Received: from gizo.domain (97-115-125-157.ptld.qwest.net. [97.115.125.157]) by smtp.gmail.com with ESMTPSA id 131-v6sm13536685pfa.128.2018.05.18.17.50.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 May 2018 17:50:25 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Fri, 18 May 2018 17:49:41 -0700 Message-Id: <1526690988-29912-34-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526690988-29912-1-git-send-email-gvrose8192@gmail.com> References: <1526690988-29912-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH V3 33/40] ip6gre: add erspan v2 to tunnel lookup X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: William Tu Upstream commit: commit 3b04caab81649a9e8d5375b919b6653d791951df Author: William Tu Date: Fri Mar 9 07:34:40 2018 -0800 ip6gre: add erspan v2 to tunnel lookup 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 Signed-off-by: David S. Miller Cc: William Tu Signed-off-by: Greg Rose Acked-by: William Tu --- datapath/linux/compat/ip6_gre.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datapath/linux/compat/ip6_gre.c b/datapath/linux/compat/ip6_gre.c index e0246d1..2f5fe49 100644 --- a/datapath/linux/compat/ip6_gre.c +++ b/datapath/linux/compat/ip6_gre.c @@ -138,7 +138,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;