[dpdk-stable] patch 'net/iavf: fix handling of unsupported promiscuous' has been queued to stable release 20.11.3

[luca.boccassi@gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.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 07/14/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/bluca/dpdk-stable

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

Thanks.

Luca Boccassi

---
From d5052b1a2e17fa17d1e9ae8ceb5553fe6bb59813 Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang@intel.com>
Date: Wed, 26 May 2021 17:53:05 +0800
Subject: [PATCH] net/iavf: fix handling of unsupported promiscuous

[ upstream commit 50937e495f5bcc5985365b3b93e34b6efffeca10 ]

iavf_execute_vf_cmd returns standard error code but not IAVF_xxx,
The patch fix the wrong error handling in iavf_config_promisc.

Fixes: 1e4d55a7fe71 ("net/iavf: optimize promiscuous device operations")

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>
---
 drivers/net/iavf/iavf_vchnl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index 064133785e..1021108ff5 100644
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -1107,8 +1107,8 @@ iavf_config_promisc(struct iavf_adapter *adapter,
 		PMD_DRV_LOG(ERR,
 			    "fail to execute command CONFIG_PROMISCUOUS_MODE");
 
-		if (err == IAVF_NOT_SUPPORTED)
-			return -ENOTSUP;
+		if (err == -ENOTSUP)
+			return err;
 
 		return -EAGAIN;
 	}
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-07-12 13:41:37.823758998 +0100
+++ 0019-net-iavf-fix-handling-of-unsupported-promiscuous.patch	2021-07-12 13:41:36.238117361 +0100
@@ -1 +1 @@
-From 50937e495f5bcc5985365b3b93e34b6efffeca10 Mon Sep 17 00:00:00 2001
+From d5052b1a2e17fa17d1e9ae8ceb5553fe6bb59813 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 50937e495f5bcc5985365b3b93e34b6efffeca10 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 5d57e8b541..02e828f9b7 100644
+index 064133785e..1021108ff5 100644
@@ -22 +23 @@
-@@ -1257,8 +1257,8 @@ iavf_config_promisc(struct iavf_adapter *adapter,
+@@ -1107,8 +1107,8 @@ iavf_config_promisc(struct iavf_adapter *adapter,