[dpdk-stable] patch 'net/hns3: fix interception with flow director' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/06/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/7313ffa29eed90936c7a4d7c114cd4be3f5211c5

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 7313ffa29eed90936c7a4d7c114cd4be3f5211c5 Mon Sep 17 00:00:00 2001
From: Lijun Ou <oulijun at huawei.com>
Date: Wed, 6 Jan 2021 11:46:27 +0800
Subject: [PATCH] net/hns3: fix interception with flow director

[ upstream commit 35ec45adf7a49d8ac2091e9f06dcf74d92083510 ]

The rte_fdir_conf structure has deprecated and users need
to use the specified rule parameters of rte_flow structure
when configure a flow rule. As a result, it is incorrectly
used in the rte_flow API.

Fixes: fcba820d9b9e ("net/hns3: support flow director")

Signed-off-by: Lijun Ou <oulijun at huawei.com>
---
 drivers/net/hns3/hns3_flow.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index bd2d4ab3bc..2eaddf7076 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1121,11 +1121,6 @@ hns3_parse_fdir_filter(struct rte_eth_dev *dev,
 					  RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
 					  "Fdir not supported in VF");
 
-	if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT)
-		return rte_flow_error_set(error, ENOTSUP,
-					  RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
-					  "fdir_conf.mode isn't perfect");
-
 	step_mngr.items = first_items;
 	step_mngr.count = ARRAY_SIZE(first_items);
 	for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:30.252372747 +0100
+++ 0052-net-hns3-fix-interception-with-flow-director.patch	2021-02-04 12:04:27.978789678 +0100
@@ -1 +1 @@
-From 35ec45adf7a49d8ac2091e9f06dcf74d92083510 Mon Sep 17 00:00:00 2001
+From 7313ffa29eed90936c7a4d7c114cd4be3f5211c5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 35ec45adf7a49d8ac2091e9f06dcf74d92083510 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index ee6ec15498..f303df4ad8 100644
+index bd2d4ab3bc..2eaddf7076 100644
@@ -23 +24 @@
-@@ -1208,11 +1208,6 @@ hns3_parse_fdir_filter(struct rte_eth_dev *dev,
+@@ -1121,11 +1121,6 @@ hns3_parse_fdir_filter(struct rte_eth_dev *dev,