svn commit: r294142 - in stable/10/sys: netinet netinet6

[Michael Tuexen]

Author: tuexen
Date: Sat Jan 16 12:33:45 2016
New Revision: 294142
URL: https://svnweb.freebsd.org/changeset/base/294142

Log:
  MFC r285877:
  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.

Modified:
  stable/10/sys/netinet/sctp_os_bsd.h
  stable/10/sys/netinet6/sctp6_usrreq.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/sctp_os_bsd.h
==============================================================================
--- stable/10/sys/netinet/sctp_os_bsd.h	Sat Jan 16 12:20:47 2016	(r294141)
+++ stable/10/sys/netinet/sctp_os_bsd.h	Sat Jan 16 12:33:45 2016	(r294142)
@@ -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>

Modified: stable/10/sys/netinet6/sctp6_usrreq.c
==============================================================================
--- stable/10/sys/netinet6/sctp6_usrreq.c	Sat Jan 16 12:20:47 2016	(r294141)
+++ stable/10/sys/netinet6/sctp6_usrreq.c	Sat Jan 16 12:33:45 2016	(r294142)
@@ -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[];