From nobody Tue Oct 25 18:09:57 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 4Mxg2Z0Pstz4gWcS; Tue, 25 Oct 2022 18:09:58 +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 4Mxg2Y6y4mz3Hd7; Tue, 25 Oct 2022 18:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666721398; 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=h44qe9BqdtiKEtgRmviSXAM+iqfY8Odu3pC5YlFMMq0=; b=b1fk1PD1Lh4lSueWQk4Cs9XLQuFlwoCEWuTkVrqF49wUG00KdnD9s0fja4s5mG/rfC1u37 qobgbCM2GiIS/H1GqGtHac7AL4xRYYJGtCGXXXpTkUjvX2k9hCoBOIN9L57j+A04fWd8/b Qg0YO5YF9KGajWCF1Vcq70pNIN8gTb3/kUkQJIMAWxLTTd0yEAX/M1g6VlrVzEpdjMcxsu 9X99kvKwxDqCN+9E+hRGdqKwVnMTWsQ6nIsJCqiKkkAFEWA/CpIyjAhow/LssiVAC7AkSs ccPgGGjRhfNYajlqgHY/QcwavlVy6a6agqYOmlVSmq5RCBxyfyex+yuhuRYqpw== 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 4Mxg2Y611mzn2x; Tue, 25 Oct 2022 18:09:57 +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 29PI9vbh065346; Tue, 25 Oct 2022 18:09:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29PI9v8e065345; Tue, 25 Oct 2022 18:09:57 GMT (envelope-from git) Date: Tue, 25 Oct 2022 18:09:57 GMT Message-Id: <202210251809.29PI9v8e065345@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: 92e190f11fe8 - main - netinet*: remove unneeded headers from files that just declare domains 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: 92e190f11fe872f7b1f1a1a22c1f10edeb3b7f8d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666721398; 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=h44qe9BqdtiKEtgRmviSXAM+iqfY8Odu3pC5YlFMMq0=; b=O1ct0J31ZG64tPLTLf9CiWhIYWOsLVV4ZeTFGu07RYSUzPdR6qJfEhH6sOGHWw6mCwU/3H 9wIi8bqUrXJRuGafIZFEqeT0U/qIDPLZ4CTzYWfPMwE83Ho0PO8/pTVjkV0VzFi/ua0VjD kQpMgHSxliviAtHLfbKKgJtLGir6wBOFljE8+fz6AuURpr6kxwZTINaMD1eVqs66/juXuO cMfcxD5VZriIYGhQjSe0Nw04EeeugMkRMq9EjWKZpygUJ4NnfGlSMG3cKJ6DN9eV2mmDtg MH7nJ+lZpUG+YmjR2XtruW6Wqza2gl/KFH4+tFeZ0Bkp9aEzwSlaKCI9vwdslg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666721398; a=rsa-sha256; cv=none; b=wyWWhuFXUaa//VGLNmv/Q7spHOFC68BJbfOr2CxK/v8+BSQaQp5VDZ+6iKoEOartJeXEfr vU82/OMuguaTWq2cFNx2VmBQSqDbVlTvOaJ6ZgC7za1D/0htodnehjQeW8kEdnBZImxqOp cuUxonWlGeOg78wbqcus+43G2+wbUb4XHJGW6G5MFKOlqNYkn/1jMZy++cDEt2tel8ma44 icjUp0UQAUyo/Y8KoQPalpnCYH8NRq9BZ8on1vSDOKZF2eZAvHTPe6AfGUVn+hBLTgMCn+ VO9xGGDCXtWiBOJKz+VdKrYRrCtPdWeTxHpXDScD3iX94J06QmSV0GUEOMvG7g== 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=92e190f11fe872f7b1f1a1a22c1f10edeb3b7f8d commit 92e190f11fe872f7b1f1a1a22c1f10edeb3b7f8d Author: Gleb Smirnoff AuthorDate: 2022-10-25 18:09:23 +0000 Commit: Gleb Smirnoff CommitDate: 2022-10-25 18:09:23 +0000 netinet*: remove unneeded headers from files that just declare domains --- sys/netinet/in_proto.c | 31 ++++--------------------------- sys/netinet6/in6_proto.c | 24 ++---------------------- 2 files changed, 6 insertions(+), 49 deletions(-) diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index 4eb037dbeed0..fa0530500a15 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -51,6 +51,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + /* * While this file provides the domain and protocol switch tables for IPv4, it * also provides the sysctl node declarations for net.inet.* often shared with @@ -58,33 +60,6 @@ __FBSDID("$FreeBSD$"); * support compile out everything but these sysctl nodes. */ #ifdef INET -#include -#include -#include -#include -#endif /* INET */ - -#if defined(INET) || defined(INET6) -#include -#endif - -#ifdef INET -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * TCP/IP protocol family: IP, ICMP, UDP, TCP. - */ #ifdef SCTP #include @@ -97,6 +72,8 @@ __FBSDID("$FreeBSD$"); 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; FEATURE(inet, "Internet Protocol version 4"); diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index da15e6e2d13d..f0e1920d09f8 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -85,31 +85,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include -#include -#include - #include -#include -#include -#include -#include -#include -#include -#include #include - -#include -#include -#include -#include -#include -#include #include -#include -#include -#include #ifdef SCTP #include @@ -123,6 +101,8 @@ __FBSDID("$FreeBSD$"); 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; /* * TCP/IP protocol family: IP6, ICMP6, UDP, TCP.