diff options
| author | tuexen <tuexen@FreeBSD.org> | 2015-07-25 18:26:09 +0000 |
|---|---|---|
| committer | tuexen <tuexen@FreeBSD.org> | 2015-07-25 18:26:09 +0000 |
| commit | c0e1a0d3a97499489347e17cdc2282028765442b (patch) | |
| tree | ad560e44b6fdd6187fe1714e88700ed324820161 | |
| parent | 9e04903a25eb9587f9f22032e3d3a914792dfce4 (diff) | |
| download | FreeBSD-src-c0e1a0d3a97499489347e17cdc2282028765442b.zip FreeBSD-src-c0e1a0d3a97499489347e17cdc2282028765442b.tar.gz | |
Move including netinet/icmp6.h around to avoid a problem when including
netinet/icmp6.h and net/netmap.h. Both use ni_flags...
This allows to build multistack with SCTP support.
MFC after: 1 week
| -rw-r--r-- | sys/netinet/sctp_os_bsd.h | 1 | ||||
| -rw-r--r-- | sys/netinet6/sctp6_usrreq.c | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h index bae67f0..0d99f54 100644 --- a/sys/netinet/sctp_os_bsd.h +++ b/sys/netinet/sctp_os_bsd.h @@ -95,7 +95,6 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet6/in6_pcb.h> -#include <netinet/icmp6.h> #include <netinet6/ip6protosw.h> #include <netinet6/nd6.h> #include <netinet6/scope6_var.h> diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index 009c47f..4f0d83d 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -39,9 +39,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/sctp_pcb.h> #include <netinet/sctp_header.h> #include <netinet/sctp_var.h> -#ifdef INET6 #include <netinet6/sctp6_var.h> -#endif #include <netinet/sctp_sysctl.h> #include <netinet/sctp_output.h> #include <netinet/sctp_uio.h> @@ -54,13 +52,12 @@ __FBSDID("$FreeBSD$"); #include <netinet/sctp_output.h> #include <netinet/sctp_bsd_addr.h> #include <netinet/sctp_crc32.h> +#include <netinet/icmp6.h> #include <netinet/udp.h> #ifdef IPSEC #include <netipsec/ipsec.h> -#ifdef INET6 #include <netipsec/ipsec6.h> -#endif /* INET6 */ #endif /* IPSEC */ extern struct protosw inetsw[]; |
