a256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780936568; 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=CO2YEdD7xZPYPmPSDDtvBIsXSl8o30Kz0zuY282O8n+lKVHiuCgTY96yq6hUASHhwjBEyE klCmvmpICQ6EKBYeBcNOdKCMNUXAKSafNE4aC+hBTQAufi4Y4F5gri0wK+zByb3uyKS0/d ivihUmxcfCiC0urZVydsl9YNCujzWwMIzSrmS7DgS9osyerloyhM6F/L15ca+sRkkUmzbo OZ7YnEXk7gwWqPyzyM4fjh9Ci+DFFyTvbSZ4TJUN5oIJU3ZbJPuVZ9uTLZcvhvpTqsnzne 5KbwZTQPU8FmTc84WmyFFZVQZYaiPr975uDCUBdI0/iD905QIU4P9ID1EOSyJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780936568; a=rsa-sha256; cv=none; b=ifRnSZ+E1dT0tqR1q3q8yz2fR1OOYIufurpqSgqUO18vZ/hWcMGrMQbYVmB0EZP1Cn/rDW qU0wPP16pHrjmqgtPEd8yLDwSjFOrlu8lM4Cc+b9mz8Uo0CTiaBGrJVf5m3dQT3v9qjIdd zJ9sAuIdLisYVZpz/eypurpcRsjSOGFJujrlHYd2KtwbzV/APm5bERoqaDorJIeNrQZHuS tRK+L2Rr3/TQbhFjKG7t6JPi+0QnQIb1wmzPWUJAbg8ZJxNdn/GjveZpaujCz1z+dSis2g 2odyur3U+McMdrePLMSOYKUb2r8ZO4RzKsUyB4L3xkI1t/4/YfYSUUDEoXOiUA== 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=1780936568; 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=lLPuE5bknR5Oa4rN857Kmvm+KmPLJXWfhk/ZEGyqwaBYPA6Okd5EnjZml0aUPiVqJXSmlM aRPbm51EXmXtN3XkqyDy9kauIhfMTbcs+pjIXmSwm3HnKAFX7YYNdP9Eedu+ImJcDjjuQN Bf4n4lCnn9bY9vt4PUJtj4EBb7oiw9LOSiBs4kRec7JkJoNxzYZ6Vws7BqXR6W4vA3ll8E N+CX+QAKTpCFmv0daM7vb6qI+4KIneEs/f4yllt1qaM1jUPYC73odzKx1rBAeR8dPutIH+ eNIgi6tAPj3sfnKJDSHMTado58JE942XCAAyKcJUXzEJoN6nfLCNSP2u8fm46A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gYyN8462GzwQW for ; Mon, 08 Jun 2026 16:36:08 +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 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 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 }, };