From nobody Wed Oct 26 15:16:56 2022 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 4MyC8S36JPz4gP75; Wed, 26 Oct 2022 15:16:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MyC8S2V8jz3Mgn; Wed, 26 Oct 2022 15:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666797416; 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=HK64zOVrO8UErtjMLLHdBuoMMYzldm5j8ar76zdRhcs=; b=stW51/dNB/t9fL12tIVOfMOi/EGLJY0NwsW++UK9G30t5m2/YWOPaxQSGf1guK6W5LPvkp m5ge18++Oi68nHu2cssw7vAcyr9FuF0NK0u0VHtLXr7lA2pO6SvSGlxurMmQX6v8UDjvEJ l4NxExhZDGVtDrj0A9QLiXERKeqvnGqoZNo4bF8j6jwlkGdesA8B9xCmipYootfr8DeZPx qEqE2ISmRW7Wri9XN3T4yk0ddx2VhagxSytc5c+qTuNvT/2kJqM5rbyuEK5uokjquYnruN i2meMFfMwN+DvBHs4jcu5LsxhUmY5uJ9g0gt+aC47WNU0sDPpbRiF1UWERKYZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MyC8S1XWpzMS3; Wed, 26 Oct 2022 15:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29QFGuZP056573; Wed, 26 Oct 2022 15:16:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29QFGuwq056571; Wed, 26 Oct 2022 15:16:56 GMT (envelope-from git) Date: Wed, 26 Oct 2022 15:16:56 GMT Message-Id: <202210261516.29QFGuwq056571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 77fe40cf2f39 - main - netinet*: add back necessary headers 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org 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: 77fe40cf2f391c7e014eb8c06f3cbd7bedf1bdde Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666797416; 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=HK64zOVrO8UErtjMLLHdBuoMMYzldm5j8ar76zdRhcs=; b=YiewhLAo6fl9XAe2OLgky3mLbDsxqYukw7RQUOf8XyHkrA0lMVNDN6/17bwrIBjI6HWDvi VKsir7bqgJHpqujxmerVqYACPtdXwcDab5Jp4v+T1dl6DmM8pB2iTOdfppyqhSDDrJXXSr PFODr+JP07Ql1kAMUAs2J5lV03kEazMKI0t4WvWzqupad8LSMlM/j6EjpdtT3NA09cGRYj Opk3feRms2X7IcIaQi2VgRUim2Fv0Sr4lj+gwHTSqW6NEDau7z5BCeYetJP6mJ6VUfVI5q JgANm+rK3Q4AcimcsiCFgW6IWrOJD/bEHtZgFXwZno7PF5w5rRWl0fNjavFfAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666797416; a=rsa-sha256; cv=none; b=AnlpLUqVXXaw46oH1/WXH3b+nhZfOWIBllIqOc1qSS435KE/C7REJx3CCZEcqKMe7Wx5Ks MM6+sMHi8fEOFXnhjZADyWPSpepcWoBvS4OjqkKYyHjJ+TmZtYsfk+NAApiokx++DOITxp QExGNRFWtcadYChCh99dkz3r6YzMsnJYH/3/aw/nvVu2VhVTLPZu1D7a2n4ltGgLdJd403 bXd2OhqzMV4ctZc5n4tMQtB4s71g5+57XaVtqqFWbiuNYi23mbsDfaBhxWi2TuCltsdig+ 0m+EpwxSV5B60pZMxpaPktlIXlG1PiAJIQb0WXqQyaqHlhyb38YO46sSF4El5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=77fe40cf2f391c7e014eb8c06f3cbd7bedf1bdde commit 77fe40cf2f391c7e014eb8c06f3cbd7bedf1bdde Author: Gleb Smirnoff AuthorDate: 2022-10-25 21:19:34 +0000 Commit: Gleb Smirnoff CommitDate: 2022-10-26 15:16:44 +0000 netinet*: add back necessary headers The LINT successful build was provided by the includes that SCTP pulled in. Fixes: 92e190f11fe872f7b1f1a1a22c1f10edeb3b7f8d --- sys/netinet/in_proto.c | 13 +++++-------- sys/netinet6/in6_proto.c | 16 ++++++++-------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index fa0530500a15..e52176f83f7d 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -51,7 +51,10 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include #include +#include /* * While this file provides the domain and protocol switch tables for IPv4, it @@ -60,20 +63,14 @@ __FBSDID("$FreeBSD$"); * support compile out everything but these sysctl nodes. */ #ifdef INET - -#ifdef SCTP -#include -#include -#include -#include -#endif - /* netinet/raw_ip.c */ extern struct protosw rip_protosw; /* netinet/udp_usrreq.c */ extern struct protosw udp_protosw, udplite_protosw; /* netinet/tcp_usrreq.c */ extern struct protosw tcp_protosw; +/* netinet/sctp_usrreq.c */ +extern struct protosw sctp_seqpacket_protosw, sctp_stream_protosw; FEATURE(inet, "Internet Protocol version 4"); diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index f0e1920d09f8..ca1257456326 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -85,24 +85,24 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include #include +#include +#include +#include #include +#include #include -#ifdef SCTP -#include -#include -#include -#include -#include -#endif /* SCTP */ - /* netinet6/raw_ip6.c */ extern struct protosw rip6_protosw; /* netinet6/udp6_usrreq.c */ extern struct protosw udp6_protosw, udplite6_protosw; /* netinet/tcp_usrreq.c */ extern struct protosw tcp6_protosw; +/* netinet/sctp6_usrreq.c */ +extern struct protosw sctp6_seqpacket_protosw, sctp6_stream_protosw; /* * TCP/IP protocol family: IP6, ICMP6, UDP, TCP.