From 9e7f20c35b25327b94ba3f7d0034abade149ce56 Mon Sep 17 00:00:00 2001
From: tuexen <tuexen@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 16 Jan 2016 12:33:45 +0000
Subject: [PATCH] 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.

git-svn-id: svn://svn.freebsd.org/base/stable/10@294142 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/netinet/sctp_os_bsd.h   | 1 -
 sys/netinet6/sctp6_usrreq.c | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h
index 7ae332a44..88ad978e9 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 767028943..34786dbe5 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[];
-- 
2.45.0