git: 21865c970888 - main - tcp: Unifidef use of rss software hash in syncache

The branch main has been updated by gallatin:

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

commit 21865c970888ad0e2cde06db843ae2a05af550e7
Author:     Andrew Gallatin <gallatin@FreeBSD.org>
AuthorDate: 2026-01-05 19:54:35 +0000
Commit:     Andrew Gallatin <gallatin@FreeBSD.org>
CommitDate: 2026-01-05 20:57:11 +0000

    tcp: Unifidef use of rss software hash in syncache
    
    Ever since "d9c55b2e8cd6 rss: Enable portions of RSS globally.."
    exposed the RSS software hashing functions, it has been possible
    to use them without "ifdef RSS".   Do so now in the syncache
    so as to get flowids recorded.
    
    Note that the use of the rss hash functions is conditional on IP versions,
    so we must ifdef INET to ensure rss_proto_software_hash_v4() is available.
    
    Fixes 73fe85e486d2
    Sponsored by: Netflix
    Reviewed by: glebius, p.mousavizadeh_protonmail.com, nickbanks_netflix.com, tuexen
    Differential Revision: https://reviews.freebsd.org/D54534
---
 sys/netinet/tcp_syncache.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 6a3c5a5c9310..8c58be63cd5a 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -35,7 +35,6 @@
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_rss.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -882,7 +881,6 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m)
 	if (sc->sc_flowtype != M_HASHTYPE_NONE) {
 		inp->inp_flowid = sc->sc_flowid;
 		inp->inp_flowtype = sc->sc_flowtype;
-#ifdef	RSS
 	} else {
 		  /* assign flowid by software RSS hash */
 #ifdef INET6
@@ -897,6 +895,7 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m)
 		  } else
 #endif	/* INET6 */
 		  {
+#ifdef INET
 			rss_proto_software_hash_v4(inp->inp_faddr,
 						   inp->inp_laddr,
 						   inp->inp_fport,
@@ -904,8 +903,8 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m)
 						   IPPROTO_TCP,
 						   &inp->inp_flowid,
 						   &inp->inp_flowtype);
+#endif /* INET */
 		  }
-#endif	/* RSS */
 	}
 #ifdef NUMA
 	inp->inp_numa_domain = sc->sc_numa_domain;