[dpdk-stable] patch 'net/bonding: fix error message on flow verify' has been queued to stable release 19.11.10

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.10

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

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 0d201efa284156695782ab65e293ebb8cc39eebf Mon Sep 17 00:00:00 2001
From: Martin Havlik <xhavli56 at stud.fit.vutbr.cz>
Date: Tue, 22 Jun 2021 11:25:28 +0200
Subject: [PATCH] net/bonding: fix error message on flow verify

[ upstream commit cb8dc97f9d7e48f6ac0f79587133ec6213ed1d18 ]

Return value is now saved to errval and log message on error reports
correct function name, doesn't use q_id which was out of context,
and uses up-to-date errval.

Fixes: 112891cd27e5 ("net/bonding: add dedicated HW queues for LACP control")

Signed-off-by: Martin Havlik <xhavli56 at stud.fit.vutbr.cz>
Acked-by: Min Hu (Connor) <humin29 at huawei.com>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 56e18bad9e..2ad36f42cf 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1791,12 +1791,13 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
 				!= 0)
 			return errval;
 
-		if (bond_ethdev_8023ad_flow_verify(bonded_eth_dev,
-				slave_eth_dev->data->port_id) != 0) {
+		errval = bond_ethdev_8023ad_flow_verify(bonded_eth_dev,
+				slave_eth_dev->data->port_id);
+		if (errval != 0) {
 			RTE_BOND_LOG(ERR,
-				"rte_eth_tx_queue_setup: port=%d queue_id %d, err (%d)",
-				slave_eth_dev->data->port_id, q_id, errval);
-			return -1;
+				"bond_ethdev_8023ad_flow_verify: port=%d, err (%d)",
+				slave_eth_dev->data->port_id, errval);
+			return errval;
 		}
 
 		if (internals->mode4.dedicated_queues.flow[slave_eth_dev->data->port_id] != NULL)
-- 
2.32.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-08-10 15:11:15.437848489 +0200
+++ 0062-net-bonding-fix-error-message-on-flow-verify.patch	2021-08-10 15:11:13.058638389 +0200
@@ -1 +1 @@
-From cb8dc97f9d7e48f6ac0f79587133ec6213ed1d18 Mon Sep 17 00:00:00 2001
+From 0d201efa284156695782ab65e293ebb8cc39eebf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cb8dc97f9d7e48f6ac0f79587133ec6213ed1d18 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index b01ef003e6..4c43bf9166 100644
+index 56e18bad9e..2ad36f42cf 100644
@@ -24 +25 @@
-@@ -1805,12 +1805,13 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
+@@ -1791,12 +1791,13 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,