From nobody Wed Oct 26 15:17:45 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 4MyC9S2ZPCz4gPN7; Wed, 26 Oct 2022 15:17:48 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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 (2048 bits) client-digest SHA256) (Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MyC9R3GZPz3N3Q; Wed, 26 Oct 2022 15:17:47 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from cell.glebi.us (localhost [127.0.0.1]) by cell.glebi.us (8.16.1/8.16.1) with ESMTPS id 29QFHjKA027318 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 26 Oct 2022 08:17:45 -0700 (PDT) (envelope-from glebius@freebsd.org) Received: (from glebius@localhost) by cell.glebi.us (8.16.1/8.16.1/Submit) id 29QFHj6v027317; Wed, 26 Oct 2022 08:17:45 -0700 (PDT) (envelope-from glebius@freebsd.org) X-Authentication-Warning: cell.glebi.us: glebius set sender to glebius@freebsd.org using -f Date: Wed, 26 Oct 2022 08:17:45 -0700 From: Gleb Smirnoff To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 77fe40cf2f39 - main - netinet*: add back necessary headers Message-ID: References: <202210261516.29QFGuwq056571@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: <202210261516.29QFGuwq056571@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4MyC9R3GZPz3N3Q X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=softfail (mx1.freebsd.org: 162.251.186.162 is neither permitted nor denied by domain of glebius@freebsd.org) smtp.mailfrom=glebius@freebsd.org X-Spamd-Result: default: False [-3.04 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.94)[-0.940]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; ASN(0.00)[asn:27348, ipnet:162.251.186.0/24, country:US]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; R_SPF_SOFTFAIL(0.00)[~all]; TO_DN_NONE(0.00)[]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[glebius]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; HAS_XAW(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-ThisMailContainsUnwantedMimeParts: N Hi, I did this fix prompty yesterday, but forgot to push it. Very sorry for so long broken build :( On Wed, Oct 26, 2022 at 03:16:56PM +0000, Gleb Smirnoff wrote: T> The branch main has been updated by glebius: T> T> URL: https://cgit.FreeBSD.org/src/commit/?id=77fe40cf2f391c7e014eb8c06f3cbd7bedf1bdde T> T> commit 77fe40cf2f391c7e014eb8c06f3cbd7bedf1bdde T> Author: Gleb Smirnoff T> AuthorDate: 2022-10-25 21:19:34 +0000 T> Commit: Gleb Smirnoff T> CommitDate: 2022-10-26 15:16:44 +0000 T> T> netinet*: add back necessary headers T> T> The LINT successful build was provided by the includes that SCTP T> pulled in. T> T> Fixes: 92e190f11fe872f7b1f1a1a22c1f10edeb3b7f8d T> --- T> sys/netinet/in_proto.c | 13 +++++-------- T> sys/netinet6/in6_proto.c | 16 ++++++++-------- T> 2 files changed, 13 insertions(+), 16 deletions(-) T> T> diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c T> index fa0530500a15..e52176f83f7d 100644 T> --- a/sys/netinet/in_proto.c T> +++ b/sys/netinet/in_proto.c T> @@ -51,7 +51,10 @@ __FBSDID("$FreeBSD$"); T> #include T> #include T> T> +#include T> +#include T> #include T> +#include T> T> /* T> * While this file provides the domain and protocol switch tables for IPv4, it T> @@ -60,20 +63,14 @@ __FBSDID("$FreeBSD$"); T> * support compile out everything but these sysctl nodes. T> */ T> #ifdef INET T> - T> -#ifdef SCTP T> -#include T> -#include T> -#include T> -#include T> -#endif T> - T> /* netinet/raw_ip.c */ T> extern struct protosw rip_protosw; T> /* netinet/udp_usrreq.c */ T> extern struct protosw udp_protosw, udplite_protosw; T> /* netinet/tcp_usrreq.c */ T> extern struct protosw tcp_protosw; T> +/* netinet/sctp_usrreq.c */ T> +extern struct protosw sctp_seqpacket_protosw, sctp_stream_protosw; T> T> FEATURE(inet, "Internet Protocol version 4"); T> T> diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c T> index f0e1920d09f8..ca1257456326 100644 T> --- a/sys/netinet6/in6_proto.c T> +++ b/sys/netinet6/in6_proto.c T> @@ -85,24 +85,24 @@ __FBSDID("$FreeBSD$"); T> #include T> #include T> T> +#include T> +#include T> #include T> +#include T> +#include T> +#include T> #include T> +#include T> #include T> T> -#ifdef SCTP T> -#include T> -#include T> -#include T> -#include T> -#include T> -#endif /* SCTP */ T> - T> /* netinet6/raw_ip6.c */ T> extern struct protosw rip6_protosw; T> /* netinet6/udp6_usrreq.c */ T> extern struct protosw udp6_protosw, udplite6_protosw; T> /* netinet/tcp_usrreq.c */ T> extern struct protosw tcp6_protosw; T> +/* netinet/sctp6_usrreq.c */ T> +extern struct protosw sctp6_seqpacket_protosw, sctp6_stream_protosw; T> T> /* T> * TCP/IP protocol family: IP6, ICMP6, UDP, TCP. T> -- Gleb Smirnoff