From 9cc860041f6db72801c34f05bebc4b19ab8b2d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=BCxen?= <tuexen@mba.local>
Date: Sat, 25 Jul 2015 21:37:49 +0200
Subject: Sync with stream-reset-improved

---
 usrsctplib/netinet6/sctp6_usrreq.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'usrsctplib/netinet6')

diff --git a/usrsctplib/netinet6/sctp6_usrreq.c b/usrsctplib/netinet6/sctp6_usrreq.c
index 493ed45e..5aa49ed2 100644
--- a/usrsctplib/netinet6/sctp6_usrreq.c
+++ b/usrsctplib/netinet6/sctp6_usrreq.c
@@ -32,7 +32,7 @@
 
 #ifdef __FreeBSD__
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 284515 2015-06-17 15:20:14Z tuexen $");
+__FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 285877 2015-07-25 18:26:09Z tuexen $");
 #endif
 
 #include <netinet/sctp_os.h>
@@ -43,9 +43,7 @@ __FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 284515 2015-06-17 15:20:14Z
 #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>
@@ -59,6 +57,7 @@ __FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 284515 2015-06-17 15:20:14Z
 #include <netinet/sctp_bsd_addr.h>
 #include <netinet/sctp_crc32.h>
 #if !defined(__Userspace_os_Windows)
+#include <netinet/icmp6.h>
 #include <netinet/udp.h>
 #endif
 
@@ -67,9 +66,7 @@ __FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 284515 2015-06-17 15:20:14Z
 #endif
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
-#ifdef INET6
 #include <netipsec/ipsec6.h>
-#endif /* INET6 */
 #endif /* IPSEC */
 
 #if !defined(__Userspace__)
-- 
cgit v1.2.3