From nobody Thu Oct 08 18:19:20 2026 X-Original-To: dev-commits-src-main@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 4j0ytx5P09z6w2T6 for ; Thu, 08 Oct 2026 18:19:21 +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 4j0ytx2jcNz4GRR for ; Thu, 08 Oct 2026 18:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791483561; 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=f+swcuA02UT3g2O0M/zaeht5hbVBaV20duRUS4S01IU=; b=dOGO70IItu+lQ8AwyCV4W/bsaqbyA08HqjYaZF7qs2a4weJA0Qeaj4FFuxGVoe2kLsfP40 pGvDKQ426eMZ7U1tBDS4TvUsDszTwEgJRj8IMqoL/60YBZqddXQKHteJoicyo2XbtLG20I /SfKBdg0teo1XZfbX6Xnd/dTUkxRzOSfGhZ/4y+JkbIiECksxGXIz/ODnnKuMNiohkBtJW /cM/1jFY6DTrP4727hiaKyghYGjdG0ah3jip01IIyODq9CSUnKb4OyrCoD54E9zGMqy+Ie gu98/z/70jPPrQTPN2hdB22MgS4I4+EqwBA9V6gQaseU57mwBvTLJK+YBREKrA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791483561; b=Up8fOQmsD6R45iDOD4Fi99HG8IKiIY6cS8qr1WrdTxDqCg9PY0AHOQEq6gKCUhhYclNC8u AdlrR0092uZrCL6+mkfQJV5mH3R1w/TktvjezuQSrJIgHNZyJFE++hMfGFUx5zeU+ghWBP iDE0CEE3aQdoc4d7RuIHCObNXbPkbxhj0vrqKXclNow3EpbiIwOdgmsR+tnMr9DIdjvueT PkEgSx57jkc60isMNwJqZkoSXpYh1upx2N2GIaMH7d5VYJOokJLMUfsmZyb2jcYbOcPyC1 2Yrc6sSnEvaMKQkKsWBMywmn4zXH20jTeZw8B3kyCvBhsc8f/jVAYpNXTK7BqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791483561; 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=f+swcuA02UT3g2O0M/zaeht5hbVBaV20duRUS4S01IU=; b=dYIgjQ6AoE6oFPmHfdZRPg8vOvYJLn873sCxwH1xPaByERT9FPEPmwPDZP3gWtxH8GzUqd vjw5D9P2M5s3p4QhkefVA7ARORHKQU9LSSBfPB9GfoW6nS17rsIlmHySMl+w0dwmoiLS7h 1PUOspW+us3R/0lHm5Tw4nI3L/B3H3gXF+23QP1e0jdWfKC9zPEK1RARPf/PLCUeKroDm5 u9DR/Clk0if5XJ9O1FnORY2kNBJ7D0IbFw5S7ZgnioDjkMf1sqypobVx4Aqrf8liHe1xUD A10/2JkG4ROmmy8J23rSFtz6iMgxoVA7LNCwTteBHi2/OexRU8XgE784xPMEqQ== 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 4j0ytw6Lpxzrk5 for ; Thu, 08 Oct 2026 18:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19bc8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 18:19:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5bf78497dc3a - main - socket: Remove the divert(4) socket compat shim again List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bf78497dc3ad24197e4940c91ab7c06230af86b Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 18:19:20 +0000 Message-Id: <6ac7dea8.19bc8.5262f882@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5bf78497dc3ad24197e4940c91ab7c06230af86b commit 5bf78497dc3ad24197e4940c91ab7c06230af86b Author: Mark Johnston AuthorDate: 2026-10-08 17:10:32 +0000 Commit: Mark Johnston CommitDate: 2026-10-08 18:19:08 +0000 socket: Remove the divert(4) socket compat shim again Python in the ports tree now handles PF_DIVERT sockets properly; see ports commit 4d84480d7a68. I no longer have any specific reason to keep the shim and Gleb wants to remove it, so, let's remove it. This reverts commit cb7009867ae6b33aa39cb6cb1453b69073144b44. Requested by: glebius Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D60390 --- sys/kern/uipc_socket.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 17f36ae69125..dc4db57c07e2 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -989,13 +989,6 @@ socreate(int dom, struct socket **aso, int type, int proto, struct socket *so; int error; -#ifdef COMPAT_FREEBSD15 - /* divert(4) historically abuses PF_INET. Use PF_DIVERT instead. */ - if (__predict_false(dom == PF_INET && type == SOCK_RAW && - proto == __IPPROTO_DIVERT)) - dom = PF_DIVERT; -#endif - prp = pffindproto(dom, type, proto); if (prp == NULL) { /* No support for domain. */