[dpdk-stable] patch 'net/e1000: fix flow error message object' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.2

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

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/351bc3464542892813f8be3e284b5ea06ae05624

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 351bc3464542892813f8be3e284b5ea06ae05624 Mon Sep 17 00:00:00 2001
From: "Min Hu (Connor)" <humin29 at huawei.com>
Date: Tue, 27 Apr 2021 16:51:21 +0800
Subject: [PATCH] net/e1000: fix flow error message object
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 6705a69cee1db95a2ddf49e48b215da60f258174 ]

This patch fixes parameter misuse when set rte flow action error.

Fixes: c0688ef1eded ("net/igb: parse flow API n-tuple filter")

Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
Acked-by: Haiyue Wang <haiyue.wang at intel.com>
---
 drivers/net/e1000/igb_flow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/e1000/igb_flow.c b/drivers/net/e1000/igb_flow.c
index ccb184df95..55c36ff00f 100644
--- a/drivers/net/e1000/igb_flow.c
+++ b/drivers/net/e1000/igb_flow.c
@@ -350,7 +350,7 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr,
 		memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
 		rte_flow_error_set(error, EINVAL,
 			RTE_FLOW_ERROR_TYPE_ACTION,
-			item, "Not supported action.");
+			act, "Not supported action.");
 		return -rte_errno;
 	}
 	filter->queue =
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-12 06:53:57.588280900 +0800
+++ 0035-net-e1000-fix-flow-error-message-object.patch	2021-06-12 06:53:56.180000000 +0800
@@ -1 +1 @@
-From 6705a69cee1db95a2ddf49e48b215da60f258174 Mon Sep 17 00:00:00 2001
+From 351bc3464542892813f8be3e284b5ea06ae05624 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 6705a69cee1db95a2ddf49e48b215da60f258174 ]
@@ -9 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +20 @@
-index 33f6b1d6b3..e72376f69c 100644
+index ccb184df95..55c36ff00f 100644