git: 77fe40cf2f39 - main - netinet*: add back necessary headers

The branch main has been updated by glebius:

URL: https://cgit.FreeBSD.org/src/commit/?id=77fe40cf2f391c7e014eb8c06f3cbd7bedf1bdde

commit 77fe40cf2f391c7e014eb8c06f3cbd7bedf1bdde
Author:     Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2022-10-25 21:19:34 +0000
Commit:     Gleb Smirnoff <glebius@FreeBSD.org>
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 <sys/queue.h>
 #include <sys/sysctl.h>
 
+#include <net/if.h>
+#include <net/if_var.h>
 #include <netinet/in.h>
+#include <netinet/in_var.h>
 
 /*
  * 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 <netinet/in_pcb.h>
-#include <netinet/sctp_pcb.h>
-#include <netinet/sctp.h>
-#include <netinet/sctp_var.h>
-#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 <sys/systm.h>
 #include <sys/sysctl.h>
 
+#include <net/if.h>
+#include <net/if_var.h>
 #include <netinet/in.h>
+#include <netinet/ip6.h>
+#include <netinet6/in6_var.h>
+#include <netinet6/ip6_var.h>
 #include <netinet/icmp6.h>
+#include <netinet6/nd6.h>
 #include <netinet6/raw_ip6.h>
 
-#ifdef SCTP
-#include <netinet/in_pcb.h>
-#include <netinet/sctp_pcb.h>
-#include <netinet/sctp.h>
-#include <netinet/sctp_var.h>
-#include <netinet6/sctp6_var.h>
-#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.