patch 'net/enic: avoid extra unlock in MTU set' 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 12/13/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=4f039a69e904d24f92922337aa0919635b08e718

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 4f039a69e904d24f92922337aa0919635b08e718 Mon Sep 17 00:00:00 2001
From: Weiguo Li <liweiguo at xencore.cn>
Date: Wed, 1 Nov 2023 15:28:09 +0800
Subject: [PATCH] net/enic: avoid extra unlock in MTU set
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit e90884a65bf6d8ed0e1e5618af42cf5856a422f1 ]

The 'set_mtu_done' goto statement is being executed in a context
where the 'mtu_lock' has not been previously locked.

To avoid the extra unlocking operation, replace the goto statement
with a return statement.

Fixes: c3e09182bcd6 ("net/enic: support scatter Rx in MTU update")

Signed-off-by: Weiguo Li <liweiguo at xencore.cn>
Reviewed-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 .mailmap                     | 2 +-
 drivers/net/enic/enic_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index a1ff0137a7..b3473b08eb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1446,7 +1446,7 @@ Waterman Cao <waterman.cao at intel.com>
 Weichun Chen <weichunx.chen at intel.com>
 Wei Dai <wei.dai at intel.com>
 Weifeng Li <liweifeng96 at 126.com>
-Weiguo Li <liwg06 at foxmail.com>
+Weiguo Li <liweiguo at xencore.cn> <liwg06 at foxmail.com>
 Wei Huang <wei.huang at intel.com>
 Wei Hu <weh at microsoft.com>
 Wei Hu (Xavier) <xavier.huwei at huawei.com>
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 19a99a82c5..a6aaa760ca 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1639,7 +1639,7 @@ int enic_set_mtu(struct enic *enic, uint16_t new_mtu)
 	 * packet length.
 	 */
 	if (!eth_dev->data->dev_started)
-		goto set_mtu_done;
+		return rc;
 
 	/*
 	 * The device has started, re-do RQs on the fly. In the process, we
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-12-11 17:56:24.277400500 +0800
+++ 0034-net-enic-avoid-extra-unlock-in-MTU-set.patch	2023-12-11 17:56:22.947652300 +0800
@@ -1 +1 @@
-From e90884a65bf6d8ed0e1e5618af42cf5856a422f1 Mon Sep 17 00:00:00 2001
+From 4f039a69e904d24f92922337aa0919635b08e718 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit e90884a65bf6d8ed0e1e5618af42cf5856a422f1 ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +25 @@
-index 1e6d750979..c384d97a1a 100644
+index a1ff0137a7..b3473b08eb 100644
@@ -26 +28 @@
-@@ -1502,7 +1502,7 @@ Waterman Cao <waterman.cao at intel.com>
+@@ -1446,7 +1446,7 @@ Waterman Cao <waterman.cao at intel.com>