svn commit: r200603 - head/sys/netinet/ipfw

[Luigi Rizzo]

Author: luigi
Date: Wed Dec 16 13:00:37 2009
New Revision: 200603
URL: http://svn.freebsd.org/changeset/base/200603

Log:
  bring back a couple of #include that are supplied by nesting,
  and explain why they are used.

Modified:
  head/sys/netinet/ipfw/ip_fw_dynamic.c
  head/sys/netinet/ipfw/ip_fw_sockopt.c

Modified: head/sys/netinet/ipfw/ip_fw_dynamic.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_dynamic.c	Wed Dec 16 12:25:27 2009	(r200602)
+++ head/sys/netinet/ipfw/ip_fw_dynamic.c	Wed Dec 16 13:00:37 2009	(r200603)
@@ -66,8 +66,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_var.h>
 #include <netinet/udp.h>
 
+#include <netinet/ip6.h>	/* IN6_ARE_ADDR_EQUAL */
 #ifdef INET6
-#include <netinet/ip6.h>
 #include <netinet6/in6_var.h>
 #include <netinet6/ip6_var.h>
 #endif

Modified: head/sys/netinet/ipfw/ip_fw_sockopt.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_sockopt.c	Wed Dec 16 12:25:27 2009	(r200602)
+++ head/sys/netinet/ipfw/ip_fw_sockopt.c	Wed Dec 16 13:00:37 2009	(r200603)
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
+#include <sys/mbuf.h>	/* struct m_tag used by nested headers */
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/priv.h>