git: ceb4116e0c72 - stable/15 - iavf: 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=ceb4116e0c72eb1b88b8eb55b410a8dd7536b99a

commit ceb4116e0c72eb1b88b8eb55b410a8dd7536b99a
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:19:18 +0000

    iavf: use newly exposed RSS hash key API rather than ad-hoc hashing
    
    Differential Revision:  https://reviews.freebsd.org/D53095
    Sponsored by: Netflix
    
    (cherry picked from commit d2790dc77ef667d3477017b37db85378ce0bca8c)
---
 sys/dev/iavf/iavf_lib.c | 10 ----------
 sys/dev/iavf/iavf_lib.h |  2 --
 2 files changed, 12 deletions(-)

diff --git a/sys/dev/iavf/iavf_lib.c b/sys/dev/iavf/iavf_lib.c
index d14f7cb49c59..e7cd9222bd68 100644
--- a/sys/dev/iavf/iavf_lib.c
+++ b/sys/dev/iavf/iavf_lib.c
@@ -1091,9 +1091,7 @@ iavf_config_rss_reg(struct iavf_sc *sc)
 	u64		set_hena = 0, hena;
 	int		i, j, que_id;
 	u32		rss_seed[IAVF_RSS_KEY_SIZE_REG];
-#ifdef RSS
 	u32		rss_hash_config;
-#endif
 
 	/* Don't set up RSS if using a single queue */
 	if (IAVF_NRXQS(vsi) == 1) {
@@ -1103,19 +1101,14 @@ iavf_config_rss_reg(struct iavf_sc *sc)
 		return;
 	}
 
-#ifdef RSS
 	/* Fetch the configured RSS key */
 	rss_getkey((uint8_t *) &rss_seed);
-#else
-	iavf_get_default_rss_key(rss_seed);
-#endif
 
 	/* Fill out hash function seed */
 	for (i = 0; i < IAVF_RSS_KEY_SIZE_REG; i++)
                 wr32(hw, IAVF_VFQF_HKEY(i), rss_seed[i]);
 
 	/* Enable PCTYPES for RSS: */
-#ifdef RSS
 	rss_hash_config = rss_gethashconfig();
 	if (rss_hash_config & RSS_HASHTYPE_RSS_IPV4)
                 set_hena |= ((u64)1 << IAVF_FILTER_PCTYPE_NONF_IPV4_OTHER);
@@ -1131,9 +1124,6 @@ iavf_config_rss_reg(struct iavf_sc *sc)
                 set_hena |= ((u64)1 << IAVF_FILTER_PCTYPE_NONF_IPV6_TCP);
         if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6)
                 set_hena |= ((u64)1 << IAVF_FILTER_PCTYPE_NONF_IPV6_UDP);
-#else
-	set_hena = IAVF_DEFAULT_RSS_HENA_XL710;
-#endif
 	hena = (u64)rd32(hw, IAVF_VFQF_HENA(0)) |
 	    ((u64)rd32(hw, IAVF_VFQF_HENA(1)) << 32);
 	hena |= set_hena;
diff --git a/sys/dev/iavf/iavf_lib.h b/sys/dev/iavf/iavf_lib.h
index 82c3a5ad99e5..a483c9e4f755 100644
--- a/sys/dev/iavf/iavf_lib.h
+++ b/sys/dev/iavf/iavf_lib.h
@@ -42,9 +42,7 @@
 #include <sys/malloc.h>
 #include <sys/stdarg.h>
 #include <sys/sysctl.h>
-#ifdef RSS
 #include <net/rss_config.h>
-#endif
 
 #include "iavf_debug.h"
 #include "iavf_osdep.h"