From nobody Sat Oct 10 15:11:07 2026 X-Original-To: dev-commits-src-all@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 4j26cq53f4z6vLYL for ; Sat, 10 Oct 2026 15:11:07 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j26cq2TLVz3NPL for ; Sat, 10 Oct 2026 15:11:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791645067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y9Apz3Jh+P7CZrZASnLhDFAfyMc6P3FgoBxukc1BEXE=; b=Ylng/i5sTPM/ubtQOsRlYcc4APpJOYFBbcvpmxlo8KhceVY7SmYj0/veYVreRWnTRCd63h 1/UtRzD1qA8T+rNiOQiYmS5+6B8FAzURuKCX4kTXDyeigPEsZmfJCnpVgbd4FXfvg1hkqL xMzRlbCAzJNM5t+Hkhy6Q1/j5vW/Tfg6Y+d6oX00PxMXhmXEsSzTl+F6KhCh3iODEdgBIh JjT2AegPmRq+PsVermtamPecqK0QhJMIWtbZv1DcdGPrRbUJJuqH89tD/FPtGNQSoCzCaN jxK5rlUJpaRcKXe39kUm6/rcTD+oowM/V5kBoWJb4oFzWNI92Gsh9TE1LEOgtw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791645067; b=B9/DNJ33SIP67UPf5VCCLid6IM9/PqrsTYiElO07NFMRaZEeqbXz3Nkoo0Q4C00iXqodpB wEolsMG2z295JQqf8g0wSi2heNUji4baNnXydZirtmDpxDXWr3ljUKX/tw+BgIRIeIUcyV M/maCYgjIHD0mibzJnQ4lqV+inJkAXh1aCQzdA0/AS9HyVXIH/JRnJgadVdM90DX5UCfSh 6L+EADDBkm/k2oDBAs920OuC3d28JxGbziUhpMT2DtZYwHPkBpiYj3iP9zdhpppWoTOh5R Jz2QFVkkvpgqraNo7v/GbxSVZDFeJNtRyBHrWlhvZ/HSTFruICE/TGiY11V67w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791645067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y9Apz3Jh+P7CZrZASnLhDFAfyMc6P3FgoBxukc1BEXE=; b=au0VEjHDrATwGXTqHGzcPCT2NkRGMtLZCVy0l1EYBBmaMg5iDchXPyI63+QYGIT8Y4WzwB lRxwvwlxFbzyTDTd/RBu0bFaUoyzXHH2GT0cwlRGJfn9NSOxKujQHKlG6tF29K714px+Is qj5nqowv4Wp7rQaGP7e5RSiGBm25DDVpdWEL1YqgOdRP6wsCQyt2ZP0MfJaxuZq7yUULM5 Smbk3bVqzT244+S9bJ80+63Otv/Q5mA6QI3yz5OsY2BS1EtS8dcYYW17SBQpUJ1PY27L6V UmKEPaDswLe0T44JGIGEtlkUx04CWZNCuKv3iSWPDRF4pyrcd9CfZKhSgq/gog== 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 4j26cq1Ggfz113v for ; Sat, 10 Oct 2026 15:11:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d7e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 10 Oct 2026 15:11:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: f877ace81633 - main - if_gre(4): Cleanup unused RSS macros List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f877ace81633822f66c2b1300040ea15ca063b8d Auto-Submitted: auto-generated Date: Sat, 10 Oct 2026 15:11:07 +0000 Message-Id: <6aca558b.3d7e2.4978ca88@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=f877ace81633822f66c2b1300040ea15ca063b8d commit f877ace81633822f66c2b1300040ea15ca063b8d Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-10-09 21:34:27 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-10-10 15:10:42 +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 --- 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 4f97371148f0..cd0b911e6c6e 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 @@ -73,19 +72,15 @@ #include #include #include -#ifdef RSS #include #endif -#endif #ifdef INET6 #include #include #include -#ifdef RSS #include #endif -#endif #include #include @@ -894,26 +889,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;