patch 'net/hns3: fix VF default MAC modified when set failed' has been queued to stable release 22.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.11.4

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/15/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=25c73bdc492a75a7b69113af35dbbca3eae4b504

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 25c73bdc492a75a7b69113af35dbbca3eae4b504 Mon Sep 17 00:00:00 2001
From: Dengdui Huang <huangdengdui at huawei.com>
Date: Sat, 5 Aug 2023 16:36:23 +0800
Subject: [PATCH] net/hns3: fix VF default MAC modified when set failed
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit ed7faab2a717347077d9e657fba010bb145a2b54 ]

When the VF fail to set the default MAC address,
"hw->mac.mac_addr" should not be updated.

Fixes: a5475d61fa34 ("net/hns3: support VF")

Signed-off-by: Dengdui Huang <huangdengdui at huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3 at huawei.com>
---
 drivers/net/hns3/hns3_ethdev_vf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 5aac62a41f..ad0ccb82fe 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -250,6 +250,8 @@ hns3vf_set_default_mac_addr(struct rte_eth_dev *dev,
 			hns3_err(hw, "Failed to set mac addr(%s) for vf: %d",
 				 mac_str, ret);
 		}
+		rte_spinlock_unlock(&hw->lock);
+		return ret;
 	}

 	rte_ether_addr_copy(mac_addr,
--
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-10-22 22:17:34.848352800 +0800
+++ 0010-net-hns3-fix-VF-default-MAC-modified-when-set-failed.patch	2023-10-22 22:17:34.136723700 +0800
@@ -1 +1 @@
-From ed7faab2a717347077d9e657fba010bb145a2b54 Mon Sep 17 00:00:00 2001
+From 25c73bdc492a75a7b69113af35dbbca3eae4b504 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit ed7faab2a717347077d9e657fba010bb145a2b54 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index 3729615159..007f5d619f 100644
+index 5aac62a41f..ad0ccb82fe 100644
@@ -22 +24 @@
-@@ -169,6 +169,8 @@ hns3vf_set_default_mac_addr(struct rte_eth_dev *dev,
+@@ -250,6 +250,8 @@ hns3vf_set_default_mac_addr(struct rte_eth_dev *dev,