From nobody Tue May 19 10:43:03 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 4gKWV00Vtfz6f0Sg for ; Tue, 19 May 2026 10:43:04 +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 4gKWTz5nRQz3DkL for ; Tue, 19 May 2026 10:43:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779187383; 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=eaGSbZd0I9qkCGj9JODHuMeeMNzluHnUAbWlEwi+Jk8=; b=rxI8DDmjoYNDaNemU4YVEn73hKb4m46REaUdXZBI9m05x5esWH7+dOzwRxQBdGBvpDiOND laauViIrIT0kezZjdl5P5x2Zaaau+uf5kbSGDVqBTpb9ddt00J0ZsD3K62fTQ7izX9p+jV dHvqEdWKRKoQEDm1jF8Q+fyVpP7BnW2WAXqe5cd3/cRbs3gj3VN14brITjZBFvrwnWxK9N CrDsHMlfeR71Jo8a/iQrAA/0B/CDrQJP9htQjdF8cq5ZoVImljBNY9sS4yrVIzw4vKYl/g ExC0cFPCWH1OAMv5FZJqcXf8uPezpwLnwLZUXAcFVdvHchUtI6xYkMBqJ9xggA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779187383; a=rsa-sha256; cv=none; b=VdaGDHC/o5Mi/2j4qdu98zjJmDIk6HtwDtt2OME7XFtz/glP6JavLOZUYx63eODu27DKK9 hQ8Kh7PMa3rS2UvsIzTZQw0V1mmc3ax5+p9fKzhL6w5J+HSdjoHOZlP79Ektyu3ZHju10U /611ia1Zjz0WK2Nswa3UPrEoONS6VwqCZFrIwbUeMfFB5Mn5k1evdBDT3Pqesqt77FEC/a t7pE9ZUhRcT73s+0kQXjbnD8DU8ge/WCMJjvt26PX7zAXGUzIKeFBg3X0clWw5fnneQghw XRlKerdtYSx68xxnJOQESNzVCsNoUsNxT5NZooWekmKILJe0Owpl3rv+fTFctw== 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=1779187383; 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=eaGSbZd0I9qkCGj9JODHuMeeMNzluHnUAbWlEwi+Jk8=; b=HKHFjjU/O4+85vRQDMsuf/6QJh2zT3HkSNofIUFPRep+TakoyumAMce+rsqYK3uxhlc/gx rgYFD57+wbHcxgMvHWOy+XWvBOizNpdq8W/qwVKnZlgyPRPpkuZZvAZR5gbe5NuiHDOW3V ZDpQeNRBKh60tvRFmvNqlwIYeB+KS0jIb2ZlSYxPhEnNj4a/3TND4Ol5Lh3tjBABbflY8+ 8Ht1SmaY3lklVjSCIz+TARMUazoViyW2dCYRC9tFCNmowC46rylYfFFxbV+CkI5Ck+Z9zJ ISeFaQKGmD3KHpq5/nOmJ9ZGhlOK1emMWsw5g6jUjCupf8+Q9jjNEqu74NzG4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKWTz5NcSz19b7 for ; Tue, 19 May 2026 10:43:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ef10 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 10:43:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: e90a0118a734 - stable/14 - sctp: fix NOINET build 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e90a0118a734f967211f501005771d13bf05b364 Auto-Submitted: auto-generated Date: Tue, 19 May 2026 10:43:03 +0000 Message-Id: <6a0c3eb7.1ef10.a1d0edf@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e90a0118a734f967211f501005771d13bf05b364 commit e90a0118a734f967211f501005771d13bf05b364 Author: Michael Tuexen AuthorDate: 2026-02-27 07:51:29 +0000 Commit: Michael Tuexen CommitDate: 2026-05-19 08:28:12 +0000 sctp: fix NOINET build Reported by: ngie Fixes: 454212b9718b ("sctp: fix so_proto when peeling off a socket") (cherry picked from commit 6bd97e9e01ff159eef49b2521fdbe67d5db10d95) --- sys/netinet/sctp_syscalls.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/sys/netinet/sctp_syscalls.c b/sys/netinet/sctp_syscalls.c index 79c1dfb21495..da7d0556a809 100644 --- a/sys/netinet/sctp_syscalls.c +++ b/sys/netinet/sctp_syscalls.c @@ -30,6 +30,8 @@ #include #include "opt_capsicum.h" +#include "opt_inet.h" +#include "opt_inet6.h" #include "opt_sctp.h" #include "opt_ktrace.h" @@ -78,6 +80,9 @@ #include #include #include +#ifdef INET6 +#include +#endif #include #include @@ -174,7 +179,21 @@ sys_sctp_peeloff(struct thread *td, struct sctp_peeloff_args *uap) td->td_retval[0] = fd; CURVNET_SET(head->so_vnet); - so = sopeeloff(head, &sctp_stream_protosw); + switch (head->so_proto->pr_domain->dom_family) { +#ifdef INET + case AF_INET: + so = sopeeloff(head, &sctp_stream_protosw); + break; +#endif +#ifdef INET6 + case AF_INET6: + so = sopeeloff(head, &sctp6_stream_protosw); + break; +#endif + default: + error = EOPNOTSUPP; + goto noconnection; + } if (so == NULL) { error = ENOMEM; goto noconnection;