From nobody Tue Apr 14 18:37:19 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 4fwCgN1XhGz6ZF41 for ; Tue, 14 Apr 2026 18:37:20 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fwCgM5cMRz3mLB for ; Tue, 14 Apr 2026 18:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776191839; 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=vexbBfl2aOGdYpzexChNgkQn4OUZku4D2Ki2s2nhfDg=; b=WB4grNffPj6iRRIOCAJ9v2Xgl4zpds7TmCEqDB4RXC5xqWpnY2OzcEGWB3qX2kJARg7Q2f DlIceQ9ueCYP/Uq9WluBvhsrfkP82NU1x8MdG9nyzbK/EXfFM8W4pohNHb/izV8GJ7rNHN K7IqkQgcYqxKp/qvbnPlvqphAH5YgvJF1kaEMqF8zSs0ijikE5HjgOTRPSTYZ95UR2aLst NrIcAfstnIlOEJ/lJVSZzPP60mcy2OqeNSB6NhQn1uYbJnbTFNOKyRZcI+yO7T1KkinJdt lIJ3Ss3l2ISG8lZp/u5Rahycog0Coft/aUeXq2B5KASOkp63kU0dvyWo90Fi/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776191839; a=rsa-sha256; cv=none; b=d7tuWtI7kOg/7zdCGD1rJzYy1Of3GKZW9qxlISdcnrQVRdE/d+emx+EhUOPqXP8dtLzt8w ANN4XQJa2o0SXqMT01ekKyg0U7SVRVLDbPnknk2pIGj2YEVswd482aJw2/wL2oNWe3p4ig xIg8YZDGRcEp5/iUU+RFnWzEF4LzYeB8bbcS3q8hWYnUS5pRwSSu5G2G0Yjs961XEszQPn kVzMlpJ8XHt8SLaIPuuiGIoGNXu4UariFhemXzVtSSpgfrAP3quKLGLhoBQhFpYXAejmwl /eG7JSF/nOIRvttfhWegweYCy2rPTiTpiK9EeaGHoJc0Pdd9UMrPVASWfub4jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776191839; 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=vexbBfl2aOGdYpzexChNgkQn4OUZku4D2Ki2s2nhfDg=; b=sWOMCt/Q2RT9c72Vi7EKHknK91v23C4Z+RKaebFmu7SojEscjCEU0JoLRgjBPDia50qxVx RDOq/OkveloSus/9RfELW72O4xpnHPAsxtvGUfwO9d5pyiGwruEbpHLCEYwiSQ97AYHerK NIee+khWOQX/s90ghKd1S+SEvZP9PX0akBLbyRpdRd1yu8R158URIBsrtYA/3eAi7hCnwM 7udCqu2FGz7/rt1Humz1iJMmbeY461rOTYRGCaQwW4p1lTiFh8YaeJ6Pg3mrqXRByhKquB UjqVrQxnsJ7y/C6TgpEmXz6pDOKr0DJcH2m4BkOUb/FZSqE9KO8D17d/LPdfsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fwCgM4hg3z12ZP for ; Tue, 14 Apr 2026 18:37:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a16c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 18:37:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0b77f92575cd - main - in_pcb: Fix RIPCB_HASH in kernels without INET or INET6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b77f92575cdfecb9920041c7c1d4cc26245e2ec Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 18:37:19 +0000 Message-Id: <69de895f.3a16c.4ab7a80d@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0b77f92575cdfecb9920041c7c1d4cc26245e2ec commit 0b77f92575cdfecb9920041c7c1d4cc26245e2ec Author: John Baldwin AuthorDate: 2026-04-14 18:25:19 +0000 Commit: John Baldwin CommitDate: 2026-04-14 18:25:19 +0000 in_pcb: Fix RIPCB_HASH in kernels without INET or INET6 Only use hashes for protocols that are enabled in the kernel configuration. Fixes: ece716c5d347 ("raw ip: move hash table manipulation to inpcb layer") --- sys/netinet/in_pcb.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index f590d464f0ea..fb52f59ff725 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -591,9 +591,17 @@ VNET_DECLARE(uint32_t, in_pcbhashseed); #define INP_PCBPORTHASH(lport, mask) (ntohs((lport)) & (mask)) +#if defined(INET) && defined(INET6) #define RIPCB_HASH(inp) (((inp)->inp_vflag & INP_IPV6) ? \ IN6_ADDR_JHASH32(&(inp)->in6p_faddr) : \ IN_ADDR_JHASH32(&(inp)->inp_faddr)) +#elif defined(INET6) +#define RIPCB_HASH(inp) \ + IN6_ADDR_JHASH32(&(inp)->in6p_faddr) +#else +#define RIPCB_HASH(inp) \ + IN_ADDR_JHASH32(&(inp)->inp_faddr) +#endif /* * Flags passed to in_pcblookup*(), inp_smr_lock() and inp_next().