patch 'net/vmxnet3: fix return code in initializing' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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

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

Thanks.

Kevin

---
>From f68f4b2b8b4b4650f31939f043c906a7182aabe4 Mon Sep 17 00:00:00 2001
From: Kaijun Zeng <corezeng at gmail.com>
Date: Wed, 7 Jun 2023 13:57:25 -0400
Subject: [PATCH] net/vmxnet3: fix return code in initializing

[ upstream commit 8a2de735318b38ba93a041cb2f209889bde02689 ]

Improve error handling

Bugzilla ID: 1239
Fixes: dfaff37fc46d ("vmxnet3: import new vmxnet3 poll mode driver implementation")

Signed-off-by: Kaijun Zeng <corezeng at gmail.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 .mailmap                           |  1 +
 drivers/net/vmxnet3/vmxnet3_rxtx.c | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index 5e85db906b..288cc4913c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -678,4 +678,5 @@ Junyu Jiang <junyux.jiang at intel.com>
 Juraj Linkeš <juraj.linkes at pantheon.tech>
 Kai Ji <kai.ji at intel.com>
+Kaijun Zeng <corezeng at gmail.com>
 Kaiwen Deng <kaiwenx.deng at intel.com>
 Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index 76bfdbaaa3..a01f2c3cdd 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -1270,9 +1270,16 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev)
 			/* Passing 0 as alloc_num will allocate full ring */
 			ret = vmxnet3_post_rx_bufs(rxq, j);
-			if (ret <= 0) {
+
+			/* Zero number of descriptors in the configuration of the RX queue */
+			if (ret == 0) {
 				PMD_INIT_LOG(ERR,
-					     "ERROR: Posting Rxq: %d buffers ring: %d",
-					     i, j);
-				return -ret;
+					"Invalid configuration in Rx queue: %d, buffers ring: %d\n",
+					i, j);
+				return -EINVAL;
+			}
+			/* Return the error number */
+			if (ret < 0) {
+				PMD_INIT_LOG(ERR, "Posting Rxq: %d buffers ring: %d", i, j);
+				return ret;
 			}
 			/*
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-20 16:18:00.952265304 +0100
+++ 0049-net-vmxnet3-fix-return-code-in-initializing.patch	2023-07-20 16:17:54.718750741 +0100
@@ -1 +1 @@
-From 8a2de735318b38ba93a041cb2f209889bde02689 Mon Sep 17 00:00:00 2001
+From f68f4b2b8b4b4650f31939f043c906a7182aabe4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8a2de735318b38ba93a041cb2f209889bde02689 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 42f198f284..986ba9c988 100644
+index 5e85db906b..288cc4913c 100644
@@ -23 +24 @@
-@@ -688,4 +688,5 @@ Junyu Jiang <junyux.jiang at intel.com>
+@@ -678,4 +678,5 @@ Junyu Jiang <junyux.jiang at intel.com>
@@ -27 +27,0 @@
- Kaisen You <kaisenx.you at intel.com>
@@ -28,0 +29 @@
+ Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
@@ -30 +31 @@
-index 148f65383e..380f41f98b 100644
+index 76bfdbaaa3..a01f2c3cdd 100644
@@ -33 +34 @@
-@@ -1338,9 +1338,16 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev)
+@@ -1270,9 +1270,16 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev)