From nobody Mon Jun 8 16:36:03 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 4gYyN345Mmz6gLdM for ; Mon, 08 Jun 2026 16:36:03 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gYyN33S7yz3DJn for ; Mon, 08 Jun 2026 16:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780936563; 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=+hxSd8FlRX484l9O5GDKG76ZWSpEpxYcve11YTTRs54=; b=dfwPIL5CLZULDwW3+/w1CYUjXBKTPOc5hi44377xKOF+yl2WAqMfvIBDjv/t/jupLm5gyo ZzxSMvUYr3qeJ080k63jp2yh1KXjf0XeZQDjyvPDVuY9DiTfSn9JmueDvUuccFxVKfH59C RFLyOdoJFHu76dlcMrISEff727lB2l+7b6ZIYv0jAkOfKnupB8YWR3igv4CwNjbsOCNB3k FFHjpiRo/NqvK7LXIIjoRd1z1YidjpgfOutbJhlc2/TZQqg4hhhnKxyeFJhs2W5+omIvCc Yp9dXMOGd6JiIe7LBYEtbDGMgptvV4EWYC8MSZUlSbvOjitIlmmAqCr51NhIlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780936563; a=rsa-sha256; cv=none; b=wLx2JqDKM7I5kDHk7/gVj6PIVGniyOen6aMJbC/J1gk+zEGVVLwyk9o/blC0iaowo4+5XZ Q/hi5s7tELxi1E83L0uRF9ccTw6y31N7w7paHBUilqK4+0q6N1fU1AM7V0zGqF9G5LVk3v MPmyU/ajohig1FNaBqVTm1+MZSiTMzu3sMbYcDR44j56HS+XdRQOaa4yEPfaAejh+LCRcc CyJgsKYP7dHoe0JBuxznJpuKz/7whXP1Kym9TdT5wkgO/Zu/IooiUF7oNBgV0KvVW5S1EI U7aRY0tloFbeqLOQe37ODxO6Pn8UMHeJyBHJdDf6xyxtbExxHyplNO9/itF35A== 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=1780936563; 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=+hxSd8FlRX484l9O5GDKG76ZWSpEpxYcve11YTTRs54=; b=G0phRgOkbDQasHDE7C6bfWoxh/vuuo5cKdtYHRi3IGjIM0U/I8ynXFFzF3hvDZPJZkYrTN gb5tBJfzglU7JPB0N1I4dpWcGw3g+e0h3zIOlvD/etByOoEFIMHPBhs7WbYMa22jLmY60V zyoVhOd3DV6lRX7t1vCMe5YaWV4BWz8JT68uWdSi5Y9WH+FSflyFQV/bfwRE1Y5m3wSpvb ha6JTETpNfGVrfzBlt9F2eOFtvPfaybQZRBKthqz+uJOHPmbtvXZjyajpgYY+TNaj1zBmI WwhkzSoexb9E5phbJLHaUFJN4tg/FwSWzgxVYlPNHt0iTpoPApbaaj1M0JTyDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gYyN330Z6zvtR for ; Mon, 08 Jun 2026 16:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24047 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Jun 2026 16:36:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 256fa87c9fc3 - main - netgraph: remove remnants of IPPROTO_DIVERT 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 256fa87c9fc31d67c3da27dd1aac0c42db3dcf41 Auto-Submitted: auto-generated Date: Mon, 08 Jun 2026 16:36:03 +0000 Message-Id: <6a26ef73.24047.737593d8@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=256fa87c9fc31d67c3da27dd1aac0c42db3dcf41 commit 256fa87c9fc31d67c3da27dd1aac0c42db3dcf41 Author: Gleb Smirnoff AuthorDate: 2026-06-08 16:35:07 +0000 Commit: Gleb Smirnoff CommitDate: 2026-06-08 16:35:07 +0000 netgraph: remove remnants of IPPROTO_DIVERT Fixes: 8624f4347e8133911b0554e816f6bedb56dc5fb3 --- share/examples/netgraph/ngctl | 2 +- sys/netgraph/ng_ksocket.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/share/examples/netgraph/ngctl b/share/examples/netgraph/ngctl index c879cbea7b0f..7ee572b4d7c0 100644 --- a/share/examples/netgraph/ngctl +++ b/share/examples/netgraph/ngctl @@ -36,7 +36,7 @@ + mkpeer ksocket foo divert/raw/0 # Note that ``foo'' is the hook name on the socket node, which can be -# anything. The ``inet/raw/divert'' is the hook name on the ksocket +# anything. The ``divert/raw/0'' is the hook name on the ksocket # node, which tells it what kind of socket to create. # Lets give our ksocket node a global name. How about ``fred'': diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index 74b2e211c0ed..bb5d56eabb86 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -165,7 +165,6 @@ static const struct ng_ksocket_alias ng_ksocket_protos[] = { { "ah6", IPPROTO_AH, PF_INET6 }, { "swipe6", IPPROTO_SWIPE, PF_INET6 }, { "encap6", IPPROTO_ENCAP, PF_INET6 }, - { "divert6", IPPROTO_DIVERT, PF_INET6 }, { "pim6", IPPROTO_PIM, PF_INET6 }, { NULL, -1 }, };