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

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.9

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

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From f5b78c208f7052afababb7b2fe4bb505b6d5d18c 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

[ 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 43fef889b5..63cb82660c 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.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:36.026100458 +0200
+++ 0169-net-e1000-fix-flow-error-message-object.patch	2021-05-17 17:40:29.495812029 +0200
@@ -1 +1 @@
-From 6705a69cee1db95a2ddf49e48b215da60f258174 Mon Sep 17 00:00:00 2001
+From f5b78c208f7052afababb7b2fe4bb505b6d5d18c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6705a69cee1db95a2ddf49e48b215da60f258174 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 33f6b1d6b3..e72376f69c 100644
+index 43fef889b5..63cb82660c 100644