git: dd615b57df62 - main - ixl: use newly exposed RSS hash key API rather than ad-hoc hashing

The branch main has been updated by gallatin:

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

commit dd615b57df62e2fa858569d66164dcd1ef840c94
Author:     Andrew Gallatin <gallatin@FreeBSD.org>
AuthorDate: 2025-11-22 14:29:32 +0000
Commit:     Andrew Gallatin <gallatin@FreeBSD.org>
CommitDate: 2025-11-22 14:29:32 +0000

    ixl: use newly exposed RSS hash key API rather than ad-hoc hashing
    
    Differential Revision:  https://reviews.freebsd.org/D53094
    Sponsored by: Netflix
---
 sys/dev/ixl/ixl.h         |  2 --
 sys/dev/ixl/ixl_pf_main.c | 15 ++-------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/sys/dev/ixl/ixl.h b/sys/dev/ixl/ixl.h
index ab0f38307d90..e265c8fbe3eb 100644
--- a/sys/dev/ixl/ixl.h
+++ b/sys/dev/ixl/ixl.h
@@ -98,10 +98,8 @@
 #include <sys/sbuf.h>
 #include <machine/smp.h>
 
-#ifdef RSS
 #include <net/rss_config.h>
 #include <netinet/in_rss.h>
-#endif
 
 #include "ifdi_if.h"
 #include "i40e_type.h"
diff --git a/sys/dev/ixl/ixl_pf_main.c b/sys/dev/ixl/ixl_pf_main.c
index b62619ced5cb..674e45823cc4 100644
--- a/sys/dev/ixl/ixl_pf_main.c
+++ b/sys/dev/ixl/ixl_pf_main.c
@@ -1101,12 +1101,8 @@ ixl_set_rss_key(struct ixl_pf *pf)
 	u32 rss_seed[IXL_RSS_KEY_SIZE_REG];
 	enum i40e_status_code status;
 
-#ifdef RSS
-        /* Fetch the configured RSS key */
-        rss_getkey((uint8_t *) &rss_seed);
-#else
-	ixl_get_default_rss_key(rss_seed);
-#endif
+	/* Fetch the configured RSS key */
+	rss_getkey((uint8_t *) &rss_seed);
 	/* Fill out hash function seed */
 	if (hw->mac.type == I40E_MAC_X722) {
 		struct i40e_aqc_get_set_rss_key_data key_data;
@@ -1132,7 +1128,6 @@ ixl_set_rss_pctypes(struct ixl_pf *pf)
 	struct i40e_hw *hw = &pf->hw;
 	u64		set_hena = 0, hena;
 
-#ifdef RSS
 	u32		rss_hash_config;
 
 	rss_hash_config = rss_gethashconfig();
@@ -1150,12 +1145,6 @@ ixl_set_rss_pctypes(struct ixl_pf *pf)
                 set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_TCP);
         if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6)
                 set_hena |= ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_UDP);
-#else
-	if (hw->mac.type == I40E_MAC_X722)
-		set_hena = IXL_DEFAULT_RSS_HENA_X722;
-	else
-		set_hena = IXL_DEFAULT_RSS_HENA_XL710;
-#endif
 	hena = (u64)i40e_read_rx_ctl(hw, I40E_PFQF_HENA(0)) |
 	    ((u64)i40e_read_rx_ctl(hw, I40E_PFQF_HENA(1)) << 32);
 	hena |= set_hena;