patch 'net/e1000/base: fix style' has been queued to stable release 24.11.7

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 24.11.7

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

Thanks.

Luca Boccassi

---
>From 43c00fafeb28352fde8b951f25228c9992b56c87 Mon Sep 17 00:00:00 2001
From: Dima Ruinskiy <dima.ruinskiy at intel.com>
Date: Wed, 20 May 2026 12:52:43 +0000
Subject: [PATCH] net/e1000/base: fix style

[ upstream commit de0a1fd78169ece6bc61888e3e03faf089fb6b42 ]

Fix whitespace and tab inconsistencies.

Fixes: a3358d942fa9 ("net/e1000/base: enable new I219 devices")
Fixes: bdca22d62ff0 ("net/e1000/base: add PHY read/write retry mechanism")

Signed-off-by: Dima Ruinskiy <dima.ruinskiy at intel.com>
Signed-off-by: Ciara Loftus <ciara.loftus at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/e1000/base/e1000_ich8lan.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/e1000/base/e1000_ich8lan.c b/drivers/net/e1000/base/e1000_ich8lan.c
index f5f91a148c..6ce73f7990 100644
--- a/drivers/net/e1000/base/e1000_ich8lan.c
+++ b/drivers/net/e1000/base/e1000_ich8lan.c
@@ -4064,7 +4064,7 @@ STATIC s32 e1000_update_nvm_checksum_spt(struct e1000_hw *hw)
 
 		usec_delay(100);
 
-		/* Write the data to the new bank. Offset in words*/
+		/* Write the data to the new bank. Offset in words */
 		act_offset = i + new_bank_offset;
 		ret_val = e1000_retry_write_flash_dword_ich8lan(hw, act_offset,
 								dword);
@@ -4087,7 +4087,7 @@ STATIC s32 e1000_update_nvm_checksum_spt(struct e1000_hw *hw)
 	 */
 	act_offset = new_bank_offset + E1000_ICH_NVM_SIG_WORD;
 
-	/*offset in words but we read dword*/
+	/* offset in words but we read dword */
 	--act_offset;
 	ret_val = e1000_read_flash_dword_ich8lan(hw, act_offset, &dword);
 
@@ -4100,7 +4100,7 @@ STATIC s32 e1000_update_nvm_checksum_spt(struct e1000_hw *hw)
 	if (ret_val)
 		goto release;
 
-	/* offset in words but we read dword*/
+	/* offset in words but we read dword */
 	act_offset = old_bank_offset + E1000_ICH_NVM_SIG_WORD - 1;
 	ret_val = e1000_read_flash_dword_ich8lan(hw, act_offset, &dword);
 
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-06-11 14:20:03.590461803 +0100
+++ 0057-net-e1000-base-fix-style.patch	2026-06-11 14:20:01.266747246 +0100
@@ -1 +1 @@
-From de0a1fd78169ece6bc61888e3e03faf089fb6b42 Mon Sep 17 00:00:00 2001
+From 43c00fafeb28352fde8b951f25228c9992b56c87 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit de0a1fd78169ece6bc61888e3e03faf089fb6b42 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -16,3 +17,2 @@
- drivers/net/intel/e1000/base/e1000_ich8lan.c | 6 +++---
- drivers/net/intel/e1000/base/e1000_phy.c     | 5 ++---
- 2 files changed, 5 insertions(+), 6 deletions(-)
+ drivers/net/e1000/base/e1000_ich8lan.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
@@ -20,5 +20,5 @@
-diff --git a/drivers/net/intel/e1000/base/e1000_ich8lan.c b/drivers/net/intel/e1000/base/e1000_ich8lan.c
-index 96b9ad6a70..e62847fb4e 100644
---- a/drivers/net/intel/e1000/base/e1000_ich8lan.c
-+++ b/drivers/net/intel/e1000/base/e1000_ich8lan.c
-@@ -4178,7 +4178,7 @@ STATIC s32 e1000_update_nvm_checksum_spt(struct e1000_hw *hw)
+diff --git a/drivers/net/e1000/base/e1000_ich8lan.c b/drivers/net/e1000/base/e1000_ich8lan.c
+index f5f91a148c..6ce73f7990 100644
+--- a/drivers/net/e1000/base/e1000_ich8lan.c
++++ b/drivers/net/e1000/base/e1000_ich8lan.c
+@@ -4064,7 +4064,7 @@ STATIC s32 e1000_update_nvm_checksum_spt(struct e1000_hw *hw)
@@ -33 +33 @@
-@@ -4201,7 +4201,7 @@ STATIC s32 e1000_update_nvm_checksum_spt(struct e1000_hw *hw)
+@@ -4087,7 +4087,7 @@ STATIC s32 e1000_update_nvm_checksum_spt(struct e1000_hw *hw)
@@ -42 +42 @@
-@@ -4214,7 +4214,7 @@ STATIC s32 e1000_update_nvm_checksum_spt(struct e1000_hw *hw)
+@@ -4100,7 +4100,7 @@ STATIC s32 e1000_update_nvm_checksum_spt(struct e1000_hw *hw)
@@ -50,30 +49,0 @@
- 
-diff --git a/drivers/net/intel/e1000/base/e1000_phy.c b/drivers/net/intel/e1000/base/e1000_phy.c
-index b449c6ef42..31ef5089ba 100644
---- a/drivers/net/intel/e1000/base/e1000_phy.c
-+++ b/drivers/net/intel/e1000/base/e1000_phy.c
-@@ -253,7 +253,7 @@ s32 e1000_phy_reset_dsp_generic(struct e1000_hw *hw)
- 	return hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, 0);
- }
- 
--void e1000_disable_phy_retry_mechanism(struct e1000_hw* hw, u32* phy_retries_original)
-+void e1000_disable_phy_retry_mechanism(struct e1000_hw *hw, u32 *phy_retries_original)
- {
- 	DEBUGFUNC("e1000_disable_phy_retry_mechanism");
- 
-@@ -262,7 +262,7 @@ void e1000_disable_phy_retry_mechanism(struct e1000_hw* hw, u32* phy_retries_ori
- 	hw->phy.current_retry_counter = 0;
- }
- 
--void e1000_enable_phy_retry_mechanism(struct e1000_hw* hw, u32 phy_retries_original)
-+void e1000_enable_phy_retry_mechanism(struct e1000_hw *hw, u32 phy_retries_original)
- {
- 	DEBUGFUNC("e1000_enable_phy_retry_mechanism");
- 
-@@ -346,7 +346,6 @@ s32 e1000_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
- 		}
- 	}
- 
--
- 	return -E1000_ERR_PHY;
- }