svn commit: r285877 - in head/sys: netinet netinet6
Michael Tuexen
tuexen at FreeBSD.org
Sat Jul 25 18:26:11 UTC 2015
Author: tuexen
Date: Sat Jul 25 18:26:09 2015
New Revision: 285877
URL: https://svnweb.freebsd.org/changeset/base/285877
Log:
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
Modified:
head/sys/netinet/sctp_os_bsd.h
head/sys/netinet6/sctp6_usrreq.c
Modified: head/sys/netinet/sctp_os_bsd.h
==============================================================================
--- head/sys/netinet/sctp_os_bsd.h Sat Jul 25 18:14:35 2015 (r285876)
+++ head/sys/netinet/sctp_os_bsd.h Sat Jul 25 18:26:09 2015 (r285877)
@@ -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: head/sys/netinet6/sctp6_usrreq.c
==============================================================================
--- head/sys/netinet6/sctp6_usrreq.c Sat Jul 25 18:14:35 2015 (r285876)
+++ head/sys/netinet6/sctp6_usrreq.c Sat Jul 25 18:26:09 2015 (r285877)
@@ -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[];
More information about the svn-src-all
mailing list