git: ac694b3ec0ad - stable/15 - if_gre(4): Cleanup unused RSS macros

The branch stable/15 has been updated by kbowling:

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

commit ac694b3ec0adc5f392f82fd25db033e77e2a6df6
Author:     Pouria Mousavizadeh Tehrani <pouria@FreeBSD.org>
AuthorDate: 2026-10-09 21:34:27 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2026-10-29 08:02:02 +0000

    if_gre(4): Cleanup unused RSS macros
    
    RSS hash calculations no longer depend on RSS macro.
    Therefore, remove unused macros and its XOR fallback.
    
    Reviewed by:    adrian
    Fixes:  9c55b2e8cd6b ("rss: Enable portions of RSS globally to ...")
    Differential Revision:  https://reviews.freebsd.org/D60556
    
    (cherry picked from commit f877ace81633822f66c2b1300040ea15ca063b8d)
---
 sys/net/if_gre.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 5f06ede64a6d..90100ee32703 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -37,7 +37,6 @@
 #include <sys/cdefs.h>
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_rss.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -71,19 +70,15 @@
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
-#ifdef RSS
 #include <netinet/in_rss.h>
 #endif
-#endif
 
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netinet6/in6_var.h>
 #include <netinet6/ip6_var.h>
-#ifdef RSS
 #include <netinet6/in6_rss.h>
 #endif
-#endif
 
 #include <netinet/ip_encap.h>
 #include <netinet/udp.h>
@@ -650,26 +645,16 @@ gre_flowid(struct gre_softc *sc, struct mbuf *m, uint32_t af)
 	switch (af) {
 #ifdef INET
 	case AF_INET:
-#ifdef RSS
 		flowid = rss_hash_ip4_2tuple(mtod(m, struct ip *)->ip_src,
 		    mtod(m, struct ip *)->ip_dst);
 		break;
-#endif
-		flowid = mtod(m, struct ip *)->ip_src.s_addr ^
-		    mtod(m, struct ip *)->ip_dst.s_addr;
-		break;
 #endif
 #ifdef INET6
 	case AF_INET6:
-#ifdef RSS
 		flowid = rss_hash_ip6_2tuple(
 		    &mtod(m, struct ip6_hdr *)->ip6_src,
 		    &mtod(m, struct ip6_hdr *)->ip6_dst);
 		break;
-#endif
-		flowid = mtod(m, struct ip6_hdr *)->ip6_src.s6_addr32[3] ^
-		    mtod(m, struct ip6_hdr *)->ip6_dst.s6_addr32[3];
-		break;
 #endif
 	default:
 		break;