From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE19FC433DF for ; Thu, 16 Jul 2020 02:08:09 +0000 (UTC) Received: from dpdk.org (dpdk.org [92.243.14.124]) by mail.kernel.org (Postfix) with ESMTP id 936C820775 for ; Thu, 16 Jul 2020 02:08:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 936C820775 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 73F401BE95; Thu, 16 Jul 2020 04:08:08 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 556A74F9A for ; Thu, 16 Jul 2020 04:08:06 +0200 (CEST) IronPort-SDR: Gq91AmxuWsa7QHJRzFFijr+6z6kXEu1VQvpypzzPQJoWMYwl8jEX5kretg6JOVrsM3RdgRDgB6 5b2ECHoOpmHA== X-IronPort-AV: E=McAfee;i="6000,8403,9683"; a="147302663" X-IronPort-AV: E=Sophos;i="5.75,357,1589266800"; d="scan'208";a="147302663" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2020 19:08:04 -0700 IronPort-SDR: M/CuPo28BbYmCZg3Iziy8dlDcrATB33kQnMNfWpK6ZxCu6wfc7pXQgdELL8Kx0V+38jwhhQvoZ FOXdeWPy7aYw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,357,1589266800"; d="scan'208";a="390963485" Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([172.16.182.123]) by fmsmga001.fm.intel.com with ESMTP; 15 Jul 2020 19:08:04 -0700 From: Wei Zhao To: dev@dpdk.org Cc: qi.z.zhang@intel.com, Wei Zhao Date: Thu, 16 Jul 2020 09:42:12 +0800 Message-Id: <20200716014212.61448-1-wei.zhao1@intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20200715020733.45086-1-wei.zhao1@intel.com> References: <20200715020733.45086-1-wei.zhao1@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2] net/ice: fix tunnel type get error X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When function ice_get_tun_type_for_recipe() get tunnel type, for ICE_NON_TUN we need to include gtp-c and some gtp-u ptype with no payload, as they do not have tunnel packet as paylod. Fixes: 418d2563d10b ("net/ice/base: get tunnel type for recipe") Signed-off-by: Wei Zhao Tested-by: Nannan Lu --- drivers/net/ice/base/ice_switch.c | 4 ++-- drivers/net/ice/base/ice_switch.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 296aa5484..ebf405f7a 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -1069,7 +1069,7 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid) non_tun_valid = true; } - if (j >= ICE_PROFID_IPV4_GTPC_TEID && + if (j >= ICE_PROFID_IPV4_GTPU_EH_IPV4_OTHER && j <= ICE_PROFID_IPV6_GTPU_IPV6_OTHER) gtp_valid = true; @@ -1136,7 +1136,7 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid) tun_type = ICE_SW_TUN_PPPOE_IPV6_TCP; break; case ICE_PROFID_PPPOE_IPV6_UDP: - tun_type = ICE_SW_TUN_PPPOE_IPV4_UDP; + tun_type = ICE_SW_TUN_PPPOE_IPV6_UDP; break; case ICE_PROFID_PPPOE_IPV6_OTHER: tun_type = ICE_SW_TUN_PPPOE_IPV6; diff --git a/drivers/net/ice/base/ice_switch.h b/drivers/net/ice/base/ice_switch.h index cc3d2702e..77c70d3b2 100644 --- a/drivers/net/ice/base/ice_switch.h +++ b/drivers/net/ice/base/ice_switch.h @@ -28,6 +28,7 @@ #define ICE_PROFID_PPPOE_IPV6_UDP 39 #define ICE_PROFID_PPPOE_IPV6_OTHER 40 #define ICE_PROFID_IPV4_GTPC_TEID 41 +#define ICE_PROFID_IPV4_GTPU_EH_IPV4_OTHER 47 #define ICE_PROFID_IPV6_GTPU_IPV6_OTHER 70 #define ICE_PROFID_IPV4_ESP 71 #define ICE_PROFID_IPV6_ESP 72 -- 2.19.1