From nobody Tue May 19 10:19:09 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 4gKVyP5CbZz6dxwr for ; Tue, 19 May 2026 10:19:09 +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 4gKVyP2YRCz46dK for ; Tue, 19 May 2026 10:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779185949; 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=JSZM9qoNY4KsjHHt+KKutEw4XWvkRUAsD4+dZu9cSpE=; b=uGuiAZhKbRgBKKCn0y8Az4i+jsQMu95hAZb+tJWFJrM0GUBW4W66XLS4HtafxM2TjLOFXp y5c9SEtEUCroHjV8oZfEqy93Bin97bGCEHyKnNis408iV5KnNuzszglxtb9Rn5lQylwlYL jDnPnAf7hB2pNJFUBEKx1QKMOFMAoWgFa7HdAprM8u4GMB0HEszqhLFDjQDl4sUZHUFTxd FCzJrM3wUhwNqjIeaKey75HQLDeSK7QUnAuXcS0AB+xS8pwchQCGSPLj7wHIFWg1kUZBi5 TUegZNsFjgFSyG4SLcvwlbEyUDkehP2gdQ9uEmxct1utqVJNgsz1cDv31tKhUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779185949; a=rsa-sha256; cv=none; b=YMEzRK4oSOkVqPVZPZ/8Wx8GNKB9yr6xs2wkl0kUKV3Ut4XyTbz4rm+g+pYEGwalU23/AA oXbvxPDPGSqXzTVKT4huUtoTo/YcMCW1khJJxSOLu1si+yHDnhnpiiWTNZqw8Xj8fzy/qr KRSuLZI2ChKetZw3VQnUFNYZcgOrNFdk4d4jtLu8jqRhiaVrUI/FYwXyG3NZKWBZI7w75f ttg5qkGhI4vRsyvvcnTAOVHWqWbFJrbltAeRdTHo9yBJibN2zPrUoii50hPcGFaceGgdeR YZP0IYnE3SjFW1etq30vEDZ0ukxvV612GMmxxVdMHpRDt3CH7RZn/+1ZHTWVdQ== 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=1779185949; 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=JSZM9qoNY4KsjHHt+KKutEw4XWvkRUAsD4+dZu9cSpE=; b=rTF3IJZKpACZtj4yl+h1ILybDQ7fDKAaR/jbNlPQDJeyor66+JTcOP+Tj2gKr42sazBN+q FRfdpiGbfTjLrNsJQ3LSa1+JxnkfUyTrehr5T4wXOHYZoJNGsubbl+VYuzSNmloy1VoyKU ieqALkKkB9ZYZ/+2p049+eq7J5I1mlWYeJUvbk9Nlsv0BXanYI3vRzlGoRiI+ZldsYREBo fbWf4PtrMEElStA1az8xbJZPYtKMqK8D98K/98NzsZ2DYk6PMk7iEwj5fbLXJ5RLPE8iiz 9sx4CJkCZkBJbES+0SLsYDppgz4tm36XpbXrRhQ5Stpf5GvRAm2q+gpjuIzD2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKVyP20Tvz18Ml for ; Tue, 19 May 2026 10:19:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bc10 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 10:19:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 9c440e552c4c - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 9c440e552c4cc252fe150b5f0edef9b8cd75a72f Auto-Submitted: auto-generated Date: Tue, 19 May 2026 10:19:09 +0000 Message-Id: <6a0c391d.1bc10.34472286@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9c440e552c4cc252fe150b5f0edef9b8cd75a72f commit 9c440e552c4cc252fe150b5f0edef9b8cd75a72f Author: Michael Tuexen AuthorDate: 2026-02-27 07:51:29 +0000 Commit: Michael Tuexen CommitDate: 2026-05-19 08:41:41 +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;