From patchwork Tue Jan 21 16:02:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Iremonger, Bernard" X-Patchwork-Id: 65016 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A948CA04DD; Tue, 21 Jan 2020 17:02:25 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ED0834C7A; Tue, 21 Jan 2020 17:02:24 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id B18074C74 for ; Tue, 21 Jan 2020 17:02:22 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Jan 2020 08:02:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,346,1574150400"; d="scan'208";a="250299528" Received: from sivswdev08.ir.intel.com (HELO localhost.localdomain) ([10.237.217.47]) by fmsmga004.fm.intel.com with ESMTP; 21 Jan 2020 08:02:17 -0800 From: Bernard Iremonger To: dev@dpdk.org, beilei.xing@intel.com, qi.z.zhang@intel.com, ferruh.yigit@intel.com, rory.sexton@intel.com Cc: Bernard Iremonger Date: Tue, 21 Jan 2020 16:02:13 +0000 Message-Id: <1579622533-15909-1-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.0.7 Subject: [dpdk-dev] [PATCH] net/i40e: fix i40e flow director merge 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" Merge of i40e_fdir.c added checks on cus_pctype->index which are not necessary and caused flow creation for ESP to fail. Removed the added lines to fix the issue. Fixes: c5f8365bc85d ("net/i40e: support flow director for L2TPv3 over IP") Signed-off-by: Bernard Iremonger --- drivers/net/i40e/i40e_fdir.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c index c346073..1d7c392 100644 --- a/drivers/net/i40e/i40e_fdir.c +++ b/drivers/net/i40e/i40e_fdir.c @@ -1063,12 +1063,7 @@ i40e_flow_fdir_fill_eth_ip_head(struct i40e_pf *pf, pctype == I40E_FILTER_PCTYPE_NONF_IPV4_SCTP || pctype == I40E_FILTER_PCTYPE_NONF_IPV4_OTHER || pctype == I40E_FILTER_PCTYPE_FRAG_IPV4 || - ((is_customized_pctype) && - ((cus_pctype->index == I40E_CUSTOMIZED_GTPC) || - (cus_pctype->index == I40E_CUSTOMIZED_GTPU_IPV4) || - (cus_pctype->index == I40E_CUSTOMIZED_GTPU_IPV6) || - (cus_pctype->index == I40E_CUSTOMIZED_GTPU) || - (cus_pctype->index == I40E_CUSTOMIZED_IPV4_L2TPV3)))) { + is_customized_pctype) { ip = (struct rte_ipv4_hdr *)raw_pkt; *ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4);