From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DAECCA0561 for ; Tue, 21 Apr 2020 08:50:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8AC881C22E; Tue, 21 Apr 2020 08:50:33 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id B78F21C224; Tue, 21 Apr 2020 08:50:30 +0200 (CEST) IronPort-SDR: JYa1K/CEFJLihsg7hu8fa1F34yRfemTTIb1AXP30cYD883U5mkv2u32eTMUdzL+72fSlwWcbLj V7kaLC4SPqhg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2020 23:50:29 -0700 IronPort-SDR: EscDdefB5tZkxcJRlyMg5pKFGXefkOWoiSmIXde451n4RX19OfQ6IKUNtQAjsqkW0gGzO94TGH q6YmDOHz9PAA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,409,1580803200"; d="scan'208";a="456656952" Received: from yexl-server.sh.intel.com (HELO localhost) ([10.67.117.17]) by fmsmga006.fm.intel.com with ESMTP; 20 Apr 2020 23:50:27 -0700 Date: Tue, 21 Apr 2020 14:46:07 +0800 From: Ye Xiaolong To: Bernard Iremonger Cc: dev@dpdk.org, beilei.xing@intel.com, qi.z.zhang@intel.com, declan.doherty@intel.com, konstantin.ananyev@intel.com, Praveen.Shetty@intel.com, stable@dpdk.org Message-ID: <20200421064607.GB4538@intel.com> References: <1586273201-21961-1-git-send-email-bernard.iremonger@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1586273201-21961-1-git-send-email-bernard.iremonger@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [dpdk-stable] [PATCH] net/i40e: fix flow director initialisation X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On 04/07, Bernard Iremonger wrote: >Remove references to struct rte_fdir_conf which is deprecated, >in i40e_flow_parse_fdir_filter(), i40e_flow_destroy() and >i40e_flow_add_del_fdir_filter(). > >Fixes: c3be43817cfb ("net/i40e: fix unexpected skip FDIR setup") >Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically") >Fixes: 4149825bbdb9 ("net/i40e: finish integration FDIR with generic flow API") >CC: stable@dpdk.org > >Signed-off-by: Bernard Iremonger >--- > drivers/net/i40e/i40e_fdir.c | 4 ++-- > drivers/net/i40e/i40e_flow.c | 7 +------ > 2 files changed, 3 insertions(+), 8 deletions(-) > >diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c >index 931f259..b603b33 100644 >--- a/drivers/net/i40e/i40e_fdir.c >+++ b/drivers/net/i40e/i40e_fdir.c >@@ -1689,8 +1689,8 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev, > struct i40e_fdir_filter check_filter; /* Check if the filter exists */ > int ret = 0; > >- if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT) { >- PMD_DRV_LOG(ERR, "FDIR is not enabled, please check the mode in fdir_conf."); >+ if (pf->fdir.fdir_vsi == NULL) { >+ PMD_DRV_LOG(ERR, "FDIR is not enabled"); > return -ENOTSUP; > } > >diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c >index d877ac2..8b6e1e4 100644 >--- a/drivers/net/i40e/i40e_flow.c >+++ b/drivers/net/i40e/i40e_flow.c >@@ -3394,8 +3394,7 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, > > cons_filter_type = RTE_ETH_FILTER_FDIR; > >- if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT || >- pf->fdir.fdir_vsi == NULL) { >+ if (pf->fdir.fdir_vsi == NULL) { > /* Enable fdir when fdir flow is added at first time. */ > ret = i40e_fdir_setup(pf); > if (ret != I40E_SUCCESS) { >@@ -3411,8 +3410,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev, > NULL, "Failed to configure fdir."); > goto err; > } >- >- dev->data->dev_conf.fdir_conf.mode = RTE_FDIR_MODE_PERFECT; > } > > return 0; >@@ -4983,8 +4980,6 @@ i40e_flow_destroy(struct rte_eth_dev *dev, > /* If the last flow is destroyed, disable fdir. */ > if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) { > i40e_fdir_teardown(pf); >- dev->data->dev_conf.fdir_conf.mode = >- RTE_FDIR_MODE_NONE; > i40e_fdir_rx_proc_enable(dev, 0); > } > break; >-- >2.7.4 > Applied to dpdk-next-net-intel, Thanks.