[dpdk-stable] patch 'net/ixgbe: do not return internal code' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/23/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 9972726126c75a95009675f3cff505c3c0e010a3 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca at debian.org>
Date: Mon, 3 Sep 2018 15:18:11 +0100
Subject: [PATCH] net/ixgbe: do not return internal code

[ upstream commit 8fd55a07941a3297208b7820fc8e544431fc5150 ]

In case of a temporary failure the ixgbe driver can return the internal
error IXGBE_ERR_RESET_FAILED to the application. Instead, return
-EAGAIN as per the public API specification.

Fixes: cddaf87a1ecb ("lib: fix unused values")

Signed-off-by: Luca Boccassi <bluca at debian.org>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 26b192737..eab9e2e7e 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -1620,5 +1620,10 @@ eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev)
 	if ((diag != IXGBE_SUCCESS) && (diag != IXGBE_ERR_INVALID_MAC_ADDR)) {
 		PMD_INIT_LOG(ERR, "VF Initialization Failure: %d", diag);
-		return diag;
+		/*
+		 * This error code will be propagated to the app by
+		 * rte_eth_dev_reset, so use a public error code rather than
+		 * the internal-only IXGBE_ERR_RESET_FAILED
+		 */
+		return -EAGAIN;
 	}
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-20 17:53:08.021733559 +0000
+++ 0023-net-ixgbe-do-not-return-internal-code.patch	2018-11-20 17:53:07.000000000 +0000
@@ -1,14 +1,15 @@
-From 8fd55a07941a3297208b7820fc8e544431fc5150 Mon Sep 17 00:00:00 2001
+From 9972726126c75a95009675f3cff505c3c0e010a3 Mon Sep 17 00:00:00 2001
 From: Luca Boccassi <bluca at debian.org>
 Date: Mon, 3 Sep 2018 15:18:11 +0100
 Subject: [PATCH] net/ixgbe: do not return internal code
 
+[ upstream commit 8fd55a07941a3297208b7820fc8e544431fc5150 ]
+
 In case of a temporary failure the ixgbe driver can return the internal
 error IXGBE_ERR_RESET_FAILED to the application. Instead, return
 -EAGAIN as per the public API specification.
 
 Fixes: cddaf87a1ecb ("lib: fix unused values")
-Cc: stable at dpdk.org
 
 Signed-off-by: Luca Boccassi <bluca at debian.org>
 Acked-by: Qi Zhang <qi.z.zhang at intel.com>