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

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