> -----Original Message-----
> From: Iremonger, Bernard <bernard.iremon...@intel.com>
> Sent: Tuesday, January 21, 2020 4:02 PM
> To: dev@dpdk.org; Xing, Beilei <beilei.x...@intel.com>; Zhang, Qi Z
> <qi.z.zh...@intel.com>; Yigit, Ferruh <ferruh.yi...@intel.com>; Sexton, Rory
> <rory.sex...@intel.com>
> Cc: Iremonger, Bernard <bernard.iremon...@intel.com>
> Subject: [PATCH] net/i40e: fix i40e flow director merge
>
> 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 <bernard.iremon...@intel.com>
> ---
> 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);
> --
> 2.7.4
NAK, causes problems for L2TPV3
