[dpdk-stable] patch 'net/e1000: fix port hotplug for multi-process' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

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/24/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.

Thanks.

Luca Boccassi

---
>From fc962b01c7428ec199de39f6cae25a737ffc7ded Mon Sep 17 00:00:00 2001
From: Alvin Zhang <alvinx.zhang at intel.com>
Date: Wed, 29 Apr 2020 14:37:24 +0800
Subject: [PATCH] net/e1000: fix port hotplug for multi-process

[ upstream commit 3a19eeb0c3329905fbb927fdbac90e548061130d ]

Enable detach device on secondary process.

Fixes: b9eee2cb8c29 ("e1000: support port hotplug")

Signed-off-by: Alvin Zhang <alvinx.zhang at intel.com>
Tested-by: Jianwei Mei <jianweix.mei at intel.com>
Reviewed-by: Jeff Guo <jia.guo at intel.com>
---
 drivers/net/e1000/em_ethdev.c  | 2 +-
 drivers/net/e1000/igb_ethdev.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index 080cbe2df5..fc47993c83 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -321,7 +321,7 @@ eth_em_dev_uninit(struct rte_eth_dev *eth_dev)
 	PMD_INIT_FUNC_TRACE();
 
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return -EPERM;
+		return 0;
 
 	eth_em_close(eth_dev);
 
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index a3e30dbe5a..e061615b88 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -922,7 +922,7 @@ eth_igb_dev_uninit(struct rte_eth_dev *eth_dev)
 	PMD_INIT_FUNC_TRACE();
 
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return -EPERM;
+		return 0;
 
 	eth_igb_close(eth_dev);
 
@@ -1043,7 +1043,7 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev)
 	PMD_INIT_FUNC_TRACE();
 
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return -EPERM;
+		return 0;
 
 	igbvf_dev_close(eth_dev);
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-22 10:37:39.606036528 +0100
+++ 0010-net-e1000-fix-port-hotplug-for-multi-process.patch	2020-05-22 10:37:39.072411710 +0100
@@ -1,12 +1,13 @@
-From 3a19eeb0c3329905fbb927fdbac90e548061130d Mon Sep 17 00:00:00 2001
+From fc962b01c7428ec199de39f6cae25a737ffc7ded Mon Sep 17 00:00:00 2001
 From: Alvin Zhang <alvinx.zhang at intel.com>
 Date: Wed, 29 Apr 2020 14:37:24 +0800
 Subject: [PATCH] net/e1000: fix port hotplug for multi-process
 
+[ upstream commit 3a19eeb0c3329905fbb927fdbac90e548061130d ]
+
 Enable detach device on secondary process.
 
 Fixes: b9eee2cb8c29 ("e1000: support port hotplug")
-Cc: stable at dpdk.org
 
 Signed-off-by: Alvin Zhang <alvinx.zhang at intel.com>
 Tested-by: Jianwei Mei <jianweix.mei at intel.com>
@@ -17,7 +18,7 @@
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
-index 188cda3508..902b1cdca0 100644
+index 080cbe2df5..fc47993c83 100644
 --- a/drivers/net/e1000/em_ethdev.c
 +++ b/drivers/net/e1000/em_ethdev.c
 @@ -321,7 +321,7 @@ eth_em_dev_uninit(struct rte_eth_dev *eth_dev)
@@ -30,10 +31,10 @@
  	eth_em_close(eth_dev);
  
 diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
-index 520fba8fab..a5551e8175 100644
+index a3e30dbe5a..e061615b88 100644
 --- a/drivers/net/e1000/igb_ethdev.c
 +++ b/drivers/net/e1000/igb_ethdev.c
-@@ -923,7 +923,7 @@ eth_igb_dev_uninit(struct rte_eth_dev *eth_dev)
+@@ -922,7 +922,7 @@ eth_igb_dev_uninit(struct rte_eth_dev *eth_dev)
  	PMD_INIT_FUNC_TRACE();
  
  	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
@@ -42,7 +43,7 @@
  
  	eth_igb_close(eth_dev);
  
-@@ -1044,7 +1044,7 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev)
+@@ -1043,7 +1043,7 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev)
  	PMD_INIT_FUNC_TRACE();
  
  	if (rte_eal_process_type() != RTE_PROC_PRIMARY)