[dpdk-stable] patch 'net/sfc: fix initialization error path' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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 06/03/20. 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-queue

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

Thanks.

Kevin.

---
>From 3dc55d5fd25b239cf88a4396d58c430d627a7b4e Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov at oktetlabs.ru>
Date: Thu, 5 Mar 2020 10:38:36 +0000
Subject: [PATCH] net/sfc: fix initialization error path

[ upstream commit ba77f3e171733b49d7c991f03b97f0df6c85c4d1 ]

NIC deinitialization should not happen after a failed NIC
initialization.

Fixes: 91831d4068c8 ("net/sfc: estimate available resources")

Signed-off-by: Igor Romanov <igor.romanov at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/net/sfc/sfc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c
index d056d12164..48d95845d6 100644
--- a/drivers/net/sfc/sfc.c
+++ b/drivers/net/sfc/sfc.c
@@ -241,6 +241,6 @@ sfc_estimate_resource_limits(struct sfc_adapter *sa)
 
 fail_get_vi_pool:
-fail_nic_init:
 	efx_nic_fini(sa->nic);
+fail_nic_init:
 	return rc;
 }
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:12:59.801447468 +0100
+++ 0012-net-sfc-fix-initialization-error-path.patch	2020-05-28 17:12:59.050557554 +0100
@@ -1 +1 @@
-From ba77f3e171733b49d7c991f03b97f0df6c85c4d1 Mon Sep 17 00:00:00 2001
+From 3dc55d5fd25b239cf88a4396d58c430d627a7b4e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ba77f3e171733b49d7c991f03b97f0df6c85c4d1 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index c6b514ac2f..3f5cd7758b 100644
+index d056d12164..48d95845d6 100644
@@ -22 +23 @@
-@@ -242,6 +242,6 @@ sfc_estimate_resource_limits(struct sfc_adapter *sa)
+@@ -241,6 +241,6 @@ sfc_estimate_resource_limits(struct sfc_adapter *sa)