[dpdk-stable] patch 'net/i40e: fix unexpected skip FDIR setup' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/03/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/0f37091a96106722aa811bba83ea1ab1d46c3e05

Thanks.

Kevin Traynor

---
>From 0f37091a96106722aa811bba83ea1ab1d46c3e05 Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Wed, 3 Jul 2019 14:34:49 +0800
Subject: [PATCH] net/i40e: fix unexpected skip FDIR setup

[ upstream commit c3be43817cfb2cac9276cbef9f7fd2bec20cc1cb ]

In i40e_flow_flush_fdir_filter, i40e_fdir_teardown is called, so
i40e_fdir_setup is required to be called before create a new fdir flow.

Bugzilla ID: 265
Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically")

Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Beilei Xing <beilei.xing at intel.com>
---
 drivers/net/i40e/i40e_flow.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index a614ec1d0..3c3b69b9f 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -3148,6 +3148,6 @@ 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) {
+	if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT ||
+		pf->fdir.fdir_vsi == NULL) {
 		/* Enable fdir when fdir flow is added at first time. */
 		ret = i40e_fdir_setup(pf);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.988132851 +0100
+++ 0038-net-i40e-fix-unexpected-skip-FDIR-setup.patch	2019-08-27 09:40:10.932144097 +0100
@@ -1 +1 @@
-From c3be43817cfb2cac9276cbef9f7fd2bec20cc1cb Mon Sep 17 00:00:00 2001
+From 0f37091a96106722aa811bba83ea1ab1d46c3e05 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c3be43817cfb2cac9276cbef9f7fd2bec20cc1cb ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index d62b32f17..48a6782a8 100644
+index a614ec1d0..3c3b69b9f 100644
@@ -23 +24 @@
-@@ -3176,6 +3176,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
+@@ -3148,6 +3148,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,