git: bf10f15ca79e - stable/14 - Revert "e1000: Correct Rx descriptor threshold programming"

From: Kevin Bowling <kbowling_at_FreeBSD.org>
Date: Sat, 22 Aug 2026 00:56:43 UTC
The branch stable/14 has been updated by kbowling:

URL: https://cgit.FreeBSD.org/src/commit/?id=bf10f15ca79eebfbe2a834b34cd5c54afb3ed96a

commit bf10f15ca79eebfbe2a834b34cd5c54afb3ed96a
Author:     Kevin Bowling <kbowling@FreeBSD.org>
AuthorDate: 2026-08-22 00:54:57 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2026-08-22 00:56:02 +0000

    Revert "e1000: Correct Rx descriptor threshold programming"
    
    Commit 98b95af873ac accidentally applied abe22383f1b1 a second
    time after its complete MFC in 081745262395.  It added a duplicate
    em_integrated_jumbo_rx() definition and broke the build.
    
    Revert only the duplicate application.  The original MFC remains in
    place.
    
    This reverts commit 98b95af873acf4beeb4ac9a0c83e5d009fb78cd9.
---
 sys/dev/e1000/if_em.c | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 13187ea210cf..d78cd0f89ac5 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -3945,27 +3945,6 @@ em_integrated_jumbo_rx(struct e1000_hw *hw)
 	}
 }
 
-static bool
-em_integrated_jumbo_rx(struct e1000_hw *hw)
-{
-	switch (hw->mac.type) {
-	case e1000_ich9lan:
-	case e1000_ich10lan:
-	case e1000_pchlan:
-	case e1000_pch2lan:
-	case e1000_pch_lpt:
-	case e1000_pch_spt:
-	case e1000_pch_cnp:
-	case e1000_pch_tgp:
-	case e1000_pch_adp:
-	case e1000_pch_mtp:
-	case e1000_pch_ptp:
-		return (true);
-	default:
-		return (false);
-	}
-}
-
 static void
 em_initialize_receive_unit(if_ctx_t ctx)
 {