From nobody Thu Oct 29 08:05:08 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jFcGX1vGdz6wJ2S for ; Thu, 29 Oct 2026 08:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFcGX0WbQz4ZvZ for ; Thu, 29 Oct 2026 08:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793261108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=08oEkAN/J+hrR0gkvEAoFVKvstZAHrXYbMPuqmOMIjI=; b=CXoXaRr5EEpWjIju0CmeSrqp+VujrWiplMGSJAr+moT7Jhff6SZRVyQy9nQf9BxgCwxz/H BAv19z2hDDBMVyMlFAiQRz3ujC516Ui31/y5zKc7LI0JgoAKkHBTwtsMftjQs83L4Qbb8T Jvrzy7K8XNGK6npLe2vALCyE+uLYJruSQ3IXvzjJCpVyI8n/S+wzMpqZEbanBsR4YTU592 oDdv5Hf73KHGkS24pSIHPnM9JKwA3K/z8VkGq2YbZR/BH4QDW5YbiNx8TkO+pMg9b3XXLu k2agzt5OjteXwBK/lBbU/FnMoiksQRXIPW2VRjwZRzpMeWIlFNCkEoi4NEMANQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793261108; b=Ku9LRcaJgISA2XyLguDemg8Uh4W7fW9X0BAEzjj8HLyRiVKPyJ2Sjg1yseUHuJIPUOG3Cu 6xRy+XZ8hIfX1qHnYKKZOvOWEnQqVx3kJewSWgdpNzmTR9RYLnS/ATQNi0MzFboOPpPao1 fozMSHuPpa0LFk4KYS0VJMQUm2ZMaZctEPaYDoNYqg7dpFneWpx4WQAPgd55vx58BncRKZ w4eHn7+gu+MaNWctQItN+fzPza1zPLdhv5+3ZbL2kt1CV9YPYSmIdakKpKOSYFtoHBsH/t Bx6qXO/WdKKppCULYvx1VkobeuE2rhdjVxMIwt/X4vyOzZnquBc2oX3rSIMCmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793261108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=08oEkAN/J+hrR0gkvEAoFVKvstZAHrXYbMPuqmOMIjI=; b=jpLm9zAbLjTVsdhbOCN8nfUTjknQuVHkOKqDxH/I41LNQ48dB1yVNw1JDL00SWilXN1hUv LH9UlipwH3l3NmtpOGyva8bV1VLctyQbEiNb/1jnS6RbViADgsFzgL9gJJcJx2CGbjn/QR K3bkQP2JXhpTb+kjP3YPO0qAYeM41m7t2SRuJw5JwPnlK8eqrWnSeeyCPzG0wbIdeNppfu +svHXdoDPBRHNkpeR3Uz0bGH1PeswE7p6DArzq0jDhP+IK1v1QyFkepwRq3r5YogrG7gA0 TWxVlWBWPeHC4W72PCNZ9gyyRRO6X1ZaGBfA9wDs0RWspYJ+fF9tHhWgzn9URw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jFcGX038wzWC5 for ; Thu, 29 Oct 2026 08:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4585b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 08:05:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Pouria Mousavizadeh Tehrani From: Kevin Bowling Subject: git: ac694b3ec0ad - stable/15 - if_gre(4): Cleanup unused RSS macros List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ac694b3ec0adc5f392f82fd25db033e77e2a6df6 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 08:05:08 +0000 Message-Id: <6ae2fe34.4585b.2eb3176c@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=ac694b3ec0adc5f392f82fd25db033e77e2a6df6 commit ac694b3ec0adc5f392f82fd25db033e77e2a6df6 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-10-09 21:34:27 +0000 Commit: Kevin Bowling 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 #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_rss.h" #include #include @@ -71,19 +70,15 @@ #include #include #include -#ifdef RSS #include #endif -#endif #ifdef INET6 #include #include #include -#ifdef RSS #include #endif -#endif #include #include @@ -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;