patch 'net/txgbe: remove useless condition for SW-FW sync' has been queued to stable release 24.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/12/25. 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

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

Thanks.

Kevin

---
>From cbc1bf3f7244ff2cb78b74258a13f6833f8dc724 Mon Sep 17 00:00:00 2001
From: Zaiyu Wang <zaiyuwang at trustnetic.com>
Date: Mon, 24 Feb 2025 17:59:08 +0800
Subject: [PATCH] net/txgbe: remove useless condition for SW-FW sync

[ upstream commit 0d6b122c28b4a3ab4cbb79103f305e49a9edfcae ]

Remove superfluous 'if' and 'else' for SW-FW sync.

Bugzilla ID: 1581
Fixes: 5364a1ce30df ("net/txgbe: add PHY init")

Signed-off-by: Zaiyu Wang <zaiyuwang at trustnetic.com>
---
 drivers/net/txgbe/base/txgbe_phy.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/txgbe/base/txgbe_phy.c b/drivers/net/txgbe/base/txgbe_phy.c
index d87af656d5..ce6882e262 100644
--- a/drivers/net/txgbe/base/txgbe_phy.c
+++ b/drivers/net/txgbe/base/txgbe_phy.c
@@ -81,10 +81,6 @@ static s32 txgbe_read_phy_if(struct txgbe_hw *hw)
 		hw->phy.addr = TXGBE_ETHPHYIF_MDIO_BASE(hw->phy.nw_mng_if_sel);
 
-	if (!hw->phy.phy_semaphore_mask) {
-		if (hw->bus.lan_id)
-			hw->phy.phy_semaphore_mask = TXGBE_MNGSEM_SWPHY;
-		else
-			hw->phy.phy_semaphore_mask = TXGBE_MNGSEM_SWPHY;
-	}
+	if (!hw->phy.phy_semaphore_mask)
+		hw->phy.phy_semaphore_mask = TXGBE_MNGSEM_SWPHY;
 
 	return 0;
-- 
2.48.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-03-07 11:02:57.392048360 +0000
+++ 0013-net-txgbe-remove-useless-condition-for-SW-FW-sync.patch	2025-03-07 11:02:56.851335617 +0000
@@ -1 +1 @@
-From 0d6b122c28b4a3ab4cbb79103f305e49a9edfcae Mon Sep 17 00:00:00 2001
+From cbc1bf3f7244ff2cb78b74258a13f6833f8dc724 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0d6b122c28b4a3ab4cbb79103f305e49a9edfcae ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org