From: Ye Xiaolong <xiaolong.ye@intel.com>
To: Bernard Iremonger <bernard.iremonger@intel.com>
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
Subject: Re: [dpdk-stable] [PATCH] net/i40e: fix flow director initialisation
Date: Tue, 21 Apr 2020 14:46:07 +0800 [thread overview]
Message-ID: <20200421064607.GB4538@intel.com> (raw)
In-Reply-To: <1586273201-21961-1-git-send-email-bernard.iremonger@intel.com>
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 <bernard.iremonger@intel.com>
>---
> 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.
prev parent reply other threads:[~2020-04-21 6:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-07 15:26 Bernard Iremonger
2020-04-13 3:03 ` Xing, Beilei
2020-04-21 6:46 ` Ye Xiaolong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200421064607.GB4538@intel.com \
--to=xiaolong.ye@intel.com \
--cc=Praveen.Shetty@intel.com \
--cc=beilei.xing@intel.com \
--cc=bernard.iremonger@intel.com \
--cc=declan.doherty@intel.com \
--cc=dev@dpdk.org \
--cc=konstantin.ananyev@intel.com \
--cc=qi.z.zhang@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).