git: adabaa0d4cd0 - stable/15 - e1000: use newly exposed RSS hash key API rather than ad-hoc hashing

The branch stable/15 has been updated by kbowling:

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

commit adabaa0d4cd02651fadf104f0e9e2705a80ba6e1
Author:     Andrew Gallatin <gallatin@FreeBSD.org>
AuthorDate: 2025-11-22 14:29:33 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2026-10-29 06:26:39 +0000

    e1000: use newly exposed RSS hash key API rather than ad-hoc hashing
    
    Differential Revision:  https://reviews.freebsd.org/D53097
    Reviewed by: kbowling
    Sponsored by: Netflix
    
    (cherry picked from commit e07b4a2e9bc4f6b2e129f3a101dfce2027694bd3)
---
 sys/dev/e1000/em_txrx.c  | 2 --
 sys/dev/e1000/if_em.c    | 4 ----
 sys/dev/e1000/if_em.h    | 2 --
 sys/dev/e1000/igb_txrx.c | 2 --
 4 files changed, 10 deletions(-)

diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c
index a4f258e9d09b..b2a877281e68 100644
--- a/sys/dev/e1000/em_txrx.c
+++ b/sys/dev/e1000/em_txrx.c
@@ -29,10 +29,8 @@
 
 #include "if_em.h"
 
-#ifdef RSS
 #include <net/rss_config.h>
 #include <netinet/in_rss.h>
-#endif
 
 #ifdef VERBOSE_DEBUG
 #define DPRINTF device_printf
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 07aeea9d0476..8d17116129d6 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -4789,12 +4789,8 @@ igb_initialize_rss_mapping(struct e1000_softc *sc)
 	 */
 	mrqc = E1000_MRQC_ENABLE_RSS_MQ;
 
-#ifdef RSS
 	/* XXX ew typecasting */
 	rss_getkey((uint8_t *) &rss_key);
-#else
-	arc4rand(&rss_key, sizeof(rss_key), 0);
-#endif
 	for (i = 0; i < 10; i++)
 		E1000_WRITE_REG_ARRAY(hw, E1000_RSSRK(0), i, rss_key[i]);
 
diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h
index 42332b43dccc..2971872fb600 100644
--- a/sys/dev/e1000/if_em.h
+++ b/sys/dev/e1000/if_em.h
@@ -72,10 +72,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/iflib.h>
-#ifdef	RSS
 #include <net/rss_config.h>
 #include <netinet/in_rss.h>
-#endif
 
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
diff --git a/sys/dev/e1000/igb_txrx.c b/sys/dev/e1000/igb_txrx.c
index ab59cd607f2c..bdabf56b7463 100644
--- a/sys/dev/e1000/igb_txrx.c
+++ b/sys/dev/e1000/igb_txrx.c
@@ -28,10 +28,8 @@
 
 #include "if_em.h"
 
-#ifdef RSS
 #include <net/rss_config.h>
 #include <netinet/in_rss.h>
-#endif
 
 #ifdef VERBOSE_DEBUG
 #define DPRINTF device_printf