Author: glebius
Date: Thu Nov 22 12:11:32 2012
New Revision: 243401
URL: http://svnweb.freebsd.org/changeset/base/243401
Log:
Partially merge r240494, which moved netinet/ipfw to netpfil/ipfw,
to make it easier to merge ipfw commits back to stable/9.
Added:
stable/9/sys/netpfil/
stable/9/sys/netpfil/ipfw/
- copied from r243400, stable/9/sys/netinet/ipfw/
Deleted:
stable/9/sys/netinet/ipfw/
Modified:
stable/9/sys/conf/files
stable/9/sys/contrib/pf/net/pf.c
stable/9/sys/modules/dummynet/Makefile
stable/9/sys/modules/ipfw/Makefile
stable/9/sys/modules/ipfw_nat/Makefile
stable/9/sys/net/if_bridge.c
stable/9/sys/net/if_ethersubr.c
stable/9/sys/netgraph/ng_ipfw.c
stable/9/sys/netpfil/ipfw/dn_heap.c
stable/9/sys/netpfil/ipfw/dn_sched_fifo.c
stable/9/sys/netpfil/ipfw/dn_sched_prio.c
stable/9/sys/netpfil/ipfw/dn_sched_qfq.c
stable/9/sys/netpfil/ipfw/dn_sched_rr.c
stable/9/sys/netpfil/ipfw/dn_sched_wf2q.c
stable/9/sys/netpfil/ipfw/ip_dn_glue.c
stable/9/sys/netpfil/ipfw/ip_dn_io.c
stable/9/sys/netpfil/ipfw/ip_dummynet.c
stable/9/sys/netpfil/ipfw/ip_fw2.c
stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c
stable/9/sys/netpfil/ipfw/ip_fw_log.c
stable/9/sys/netpfil/ipfw/ip_fw_nat.c
stable/9/sys/netpfil/ipfw/ip_fw_pfil.c
stable/9/sys/netpfil/ipfw/ip_fw_sockopt.c
stable/9/sys/netpfil/ipfw/ip_fw_table.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/conf/files
==============================================================================
--- stable/9/sys/conf/files Thu Nov 22 10:36:10 2012 (r243400)
+++ stable/9/sys/conf/files Thu Nov 22 12:11:32 2012 (r243401)
@@ -2842,26 +2842,9 @@ netinet/in_proto.c optional inet | inet
compile-with "${NORMAL_C} -I$S/contrib/pf"
netinet/in_rmx.c optional inet
netinet/ip_divert.c optional inet ipdivert ipfirewall
-netinet/ipfw/dn_heap.c optional inet dummynet
-netinet/ipfw/dn_sched_fifo.c optional inet dummynet
-netinet/ipfw/dn_sched_prio.c optional inet dummynet
-netinet/ipfw/dn_sched_qfq.c optional inet dummynet
-netinet/ipfw/dn_sched_rr.c optional inet dummynet
-netinet/ipfw/dn_sched_wf2q.c optional inet dummynet
-netinet/ipfw/ip_dummynet.c optional inet dummynet
-netinet/ipfw/ip_dn_io.c optional inet dummynet
-netinet/ipfw/ip_dn_glue.c optional inet dummynet
netinet/ip_ecn.c optional inet | inet6
netinet/ip_encap.c optional inet | inet6
netinet/ip_fastfwd.c optional inet
-netinet/ipfw/ip_fw2.c optional inet ipfirewall \
- compile-with "${NORMAL_C} -I$S/contrib/pf"
-netinet/ipfw/ip_fw_dynamic.c optional inet ipfirewall
-netinet/ipfw/ip_fw_log.c optional inet ipfirewall
-netinet/ipfw/ip_fw_pfil.c optional inet ipfirewall
-netinet/ipfw/ip_fw_sockopt.c optional inet ipfirewall
-netinet/ipfw/ip_fw_table.c optional inet ipfirewall
-netinet/ipfw/ip_fw_nat.c optional inet ipfirewall_nat
netinet/ip_icmp.c optional inet | inet6
netinet/ip_input.c optional inet
netinet/ip_ipsec.c optional inet ipsec
@@ -2969,6 +2952,23 @@ netncp/ncp_nls.c optional ncp
netncp/ncp_rq.c optional ncp
netncp/ncp_sock.c optional ncp
netncp/ncp_subr.c optional ncp
+netpfil/ipfw/dn_heap.c optional inet dummynet
+netpfil/ipfw/dn_sched_fifo.c optional inet dummynet
+netpfil/ipfw/dn_sched_prio.c optional inet dummynet
+netpfil/ipfw/dn_sched_qfq.c optional inet dummynet
+netpfil/ipfw/dn_sched_rr.c optional inet dummynet
+netpfil/ipfw/dn_sched_wf2q.c optional inet dummynet
+netpfil/ipfw/ip_dummynet.c optional inet dummynet
+netpfil/ipfw/ip_dn_io.c optional inet dummynet
+netpfil/ipfw/ip_dn_glue.c optional inet dummynet
+netpfil/ipfw/ip_fw2.c optional inet ipfirewall \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+netpfil/ipfw/ip_fw_dynamic.c optional inet ipfirewall
+netpfil/ipfw/ip_fw_log.c optional inet ipfirewall
+netpfil/ipfw/ip_fw_pfil.c optional inet ipfirewall
+netpfil/ipfw/ip_fw_sockopt.c optional inet ipfirewall
+netpfil/ipfw/ip_fw_table.c optional inet ipfirewall
+netpfil/ipfw/ip_fw_nat.c optional inet ipfirewall_nat
netsmb/smb_conn.c optional netsmb
netsmb/smb_crypt.c optional netsmb
netsmb/smb_dev.c optional netsmb
Modified: stable/9/sys/contrib/pf/net/pf.c
==============================================================================
--- stable/9/sys/contrib/pf/net/pf.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/contrib/pf/net/pf.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -122,7 +122,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/if_ether.h>
#ifdef __FreeBSD__
#include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h> /* XXX: only for DIR_IN/DIR_OUT */
+#include <netpfil/ipfw/ip_fw_private.h> /* XXX: only for DIR_IN/DIR_OUT */
#endif
#ifndef __FreeBSD__
Modified: stable/9/sys/modules/dummynet/Makefile
==============================================================================
--- stable/9/sys/modules/dummynet/Makefile Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/modules/dummynet/Makefile Thu Nov 22 12:11:32 2012
(r243401)
@@ -2,7 +2,7 @@
.include <bsd.own.mk>
-.PATH: ${.CURDIR}/../../netinet/ipfw
+.PATH: ${.CURDIR}/../../netpfil/ipfw
KMOD= dummynet
SRCS= ip_dummynet.c
SRCS+= ip_dn_glue.c ip_dn_io.c
Modified: stable/9/sys/modules/ipfw/Makefile
==============================================================================
--- stable/9/sys/modules/ipfw/Makefile Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/modules/ipfw/Makefile Thu Nov 22 12:11:32 2012
(r243401)
@@ -2,7 +2,7 @@
.include <bsd.own.mk>
-.PATH: ${.CURDIR}/../../netinet/ipfw
+.PATH: ${.CURDIR}/../../netpfil/ipfw
KMOD= ipfw
SRCS= ip_fw2.c ip_fw_pfil.c
Modified: stable/9/sys/modules/ipfw_nat/Makefile
==============================================================================
--- stable/9/sys/modules/ipfw_nat/Makefile Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/modules/ipfw_nat/Makefile Thu Nov 22 12:11:32 2012
(r243401)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../netinet/ipfw
+.PATH: ${.CURDIR}/../../netpfil/ipfw
KMOD= ipfw_nat
SRCS= ip_fw_nat.c
Modified: stable/9/sys/net/if_bridge.c
==============================================================================
--- stable/9/sys/net/if_bridge.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/net/if_bridge.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -132,7 +132,7 @@ __FBSDID("$FreeBSD$");
#include <net/route.h>
#include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
+#include <netpfil/ipfw/ip_fw_private.h>
/*
* Size of the route hash table. Must be a power of two.
Modified: stable/9/sys/net/if_ethersubr.c
==============================================================================
--- stable/9/sys/net/if_ethersubr.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/net/if_ethersubr.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -72,7 +72,7 @@
#include <netinet/ip_carp.h>
#include <netinet/ip_var.h>
#include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
+#include <netpfil/ipfw/ip_fw_private.h>
#endif
#ifdef INET6
#include <netinet6/nd6.h>
Modified: stable/9/sys/netgraph/ng_ipfw.c
==============================================================================
--- stable/9/sys/netgraph/ng_ipfw.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netgraph/ng_ipfw.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -48,11 +48,12 @@
#include <netinet/in_var.h>
#include <netinet/ip_var.h>
#include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
#include <netinet/ip.h>
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
+#include <netpfil/ipfw/ip_fw_private.h>
+
#include <netgraph/ng_message.h>
#include <netgraph/ng_parse.h>
#include <netgraph/ng_ipfw.h>
Modified: stable/9/sys/netpfil/ipfw/dn_heap.c
==============================================================================
--- stable/9/sys/netinet/ipfw/dn_heap.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/dn_heap.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <netinet/ipfw/dn_heap.h>
+#include <netpfil/ipfw/dn_heap.h>
#ifndef log
#define log(x, arg...)
#endif
Modified: stable/9/sys/netpfil/ipfw/dn_sched_fifo.c
==============================================================================
--- stable/9/sys/netinet/ipfw/dn_sched_fifo.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/dn_sched_fifo.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -40,9 +40,9 @@
#include <netinet/ip_var.h> /* ipfw_rule_ref */
#include <netinet/ip_fw.h> /* flow_id */
#include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/dn_heap.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
#else
#include <dn_test.h>
#endif
Modified: stable/9/sys/netpfil/ipfw/dn_sched_prio.c
==============================================================================
--- stable/9/sys/netinet/ipfw/dn_sched_prio.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/dn_sched_prio.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -39,9 +39,9 @@
#include <netinet/ip_var.h> /* ipfw_rule_ref */
#include <netinet/ip_fw.h> /* flow_id */
#include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/dn_heap.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
#else
#include <dn_test.h>
#endif
Modified: stable/9/sys/netpfil/ipfw/dn_sched_qfq.c
==============================================================================
--- stable/9/sys/netinet/ipfw/dn_sched_qfq.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/dn_sched_qfq.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -40,9 +40,9 @@
#include <netinet/ip_var.h> /* ipfw_rule_ref */
#include <netinet/ip_fw.h> /* flow_id */
#include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/dn_heap.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
#else
#include <dn_test.h>
#endif
Modified: stable/9/sys/netpfil/ipfw/dn_sched_rr.c
==============================================================================
--- stable/9/sys/netinet/ipfw/dn_sched_rr.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/dn_sched_rr.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -40,9 +40,9 @@
#include <netinet/ip_var.h> /* ipfw_rule_ref */
#include <netinet/ip_fw.h> /* flow_id */
#include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/dn_heap.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
#else
#include <dn_test.h>
#endif
Modified: stable/9/sys/netpfil/ipfw/dn_sched_wf2q.c
==============================================================================
--- stable/9/sys/netinet/ipfw/dn_sched_wf2q.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/dn_sched_wf2q.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -41,9 +41,9 @@
#include <netinet/ip_var.h> /* ipfw_rule_ref */
#include <netinet/ip_fw.h> /* flow_id */
#include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/dn_heap.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
#else
#include <dn_test.h>
#endif
Modified: stable/9/sys/netpfil/ipfw/ip_dn_glue.c
==============================================================================
--- stable/9/sys/netinet/ipfw/ip_dn_glue.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/ip_dn_glue.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -50,11 +50,12 @@
#include <netinet/in.h>
#include <netinet/ip_var.h> /* ip_output(), IP_FORWARDING */
#include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
-#include <netinet/ipfw/dn_heap.h>
#include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
+
+#include <netpfil/ipfw/ip_fw_private.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
/* FREEBSD7.2 ip_dummynet.h r191715*/
Modified: stable/9/sys/netpfil/ipfw/ip_dn_io.c
==============================================================================
--- stable/9/sys/netinet/ipfw/ip_dn_io.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/ip_dn_io.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -54,17 +54,16 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip.h> /* ip_len, ip_off */
#include <netinet/ip_var.h> /* ip_output(), IP_FORWARDING */
#include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
-#include <netinet/ipfw/dn_heap.h>
#include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
-
#include <netinet/if_ether.h> /* various ether_* routines */
-
#include <netinet/ip6.h> /* for ip6_input, ip6_output prototypes */
#include <netinet6/ip6_var.h>
+#include <netpfil/ipfw/ip_fw_private.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
+
/*
* We keep a private variable for the simulation time, but we could
* probably use an existing one ("softticks" in sys/kern/kern_timeout.c)
Modified: stable/9/sys/netpfil/ipfw/ip_dummynet.c
==============================================================================
--- stable/9/sys/netinet/ipfw/ip_dummynet.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/ip_dummynet.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -52,11 +52,12 @@ __FBSDID("$FreeBSD$");
#include <netinet/in.h>
#include <netinet/ip_var.h> /* ip_output(), IP_FORWARDING */
#include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
-#include <netinet/ipfw/dn_heap.h>
#include <netinet/ip_dummynet.h>
-#include <netinet/ipfw/ip_dn_private.h>
-#include <netinet/ipfw/dn_sched.h>
+
+#include <netpfil/ipfw/ip_fw_private.h>
+#include <netpfil/ipfw/dn_heap.h>
+#include <netpfil/ipfw/ip_dn_private.h>
+#include <netpfil/ipfw/dn_sched.h>
/* which objects to copy */
#define DN_C_LINK 0x01
Modified: stable/9/sys/netpfil/ipfw/ip_fw2.c
==============================================================================
--- stable/9/sys/netinet/ipfw/ip_fw2.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/ip_fw2.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip_var.h>
#include <netinet/ip_icmp.h>
#include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
#include <netinet/ip_carp.h>
#include <netinet/pim.h>
#include <netinet/tcp_var.h>
@@ -86,6 +85,8 @@ __FBSDID("$FreeBSD$");
#include <netinet6/ip6_var.h>
#endif
+#include <netpfil/ipfw/ip_fw_private.h>
+
#include <machine/in_cksum.h> /* XXX for in_cksum */
#ifdef MAC
Modified: stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c
==============================================================================
--- stable/9/sys/netinet/ipfw/ip_fw_dynamic.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/ip_fw_dynamic.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip.h>
#include <netinet/ip_var.h> /* ip_defttl */
#include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
#include <netinet/tcp_var.h>
#include <netinet/udp.h>
@@ -67,6 +66,8 @@ __FBSDID("$FreeBSD$");
#include <netinet6/ip6_var.h>
#endif
+#include <netpfil/ipfw/ip_fw_private.h>
+
#include <machine/in_cksum.h> /* XXX for in_cksum */
#ifdef MAC
Modified: stable/9/sys/netpfil/ipfw/ip_fw_log.c
==============================================================================
--- stable/9/sys/netinet/ipfw/ip_fw_log.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/ip_fw_log.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip_icmp.h>
#include <netinet/ip_var.h>
#include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
#include <netinet/tcp_var.h>
#include <netinet/udp.h>
@@ -65,6 +64,8 @@ __FBSDID("$FreeBSD$");
#include <netinet6/in6_var.h> /* ip6_sprintf() */
#endif
+#include <netpfil/ipfw/ip_fw_private.h>
+
#ifdef MAC
#include <security/mac/mac_framework.h>
#endif
Modified: stable/9/sys/netpfil/ipfw/ip_fw_nat.c
==============================================================================
--- stable/9/sys/netinet/ipfw/ip_fw_nat.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/ip_fw_nat.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -46,10 +46,11 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip.h>
#include <netinet/ip_var.h>
#include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
#include <netinet/tcp.h>
#include <netinet/udp.h>
+#include <netpfil/ipfw/ip_fw_private.h>
+
#include <machine/in_cksum.h> /* XXX for in_cksum */
static VNET_DEFINE(eventhandler_tag, ifaddr_event_tag);
Modified: stable/9/sys/netpfil/ipfw/ip_fw_pfil.c
==============================================================================
--- stable/9/sys/netinet/ipfw/ip_fw_pfil.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/ip_fw_pfil.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -59,9 +59,11 @@ __FBSDID("$FreeBSD$");
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#endif
-#include <netinet/ipfw/ip_fw_private.h>
+
#include <netgraph/ng_ipfw.h>
+#include <netpfil/ipfw/ip_fw_private.h>
+
#include <machine/in_cksum.h>
static VNET_DEFINE(int, fw_enable) = 1;
Modified: stable/9/sys/netpfil/ipfw/ip_fw_sockopt.c
==============================================================================
--- stable/9/sys/netinet/ipfw/ip_fw_sockopt.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/ip_fw_sockopt.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -60,7 +60,8 @@ __FBSDID("$FreeBSD$");
#include <netinet/in.h>
#include <netinet/ip_var.h> /* hooks */
#include <netinet/ip_fw.h>
-#include <netinet/ipfw/ip_fw_private.h>
+
+#include <netpfil/ipfw/ip_fw_private.h>
#ifdef MAC
#include <security/mac/mac_framework.h>
Modified: stable/9/sys/netpfil/ipfw/ip_fw_table.c
==============================================================================
--- stable/9/sys/netinet/ipfw/ip_fw_table.c Thu Nov 22 10:36:10 2012
(r243400)
+++ stable/9/sys/netpfil/ipfw/ip_fw_table.c Thu Nov 22 12:11:32 2012
(r243401)
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
#include <sys/lock.h>
#include <sys/rwlock.h>
#include <sys/socket.h>
+#include <sys/queue.h>
#include <net/if.h> /* ip_fw.h requires IFNAMSIZ */
#include <net/radix.h>
#include <net/route.h>
@@ -61,8 +62,8 @@ __FBSDID("$FreeBSD$");
#include <netinet/in.h>
#include <netinet/ip_var.h> /* struct ipfw_rule_ref */
#include <netinet/ip_fw.h>
-#include <sys/queue.h> /* LIST_HEAD */
-#include <netinet/ipfw/ip_fw_private.h>
+
+#include <netpfil/ipfw/ip_fw_private.h>
#ifdef MAC
#include <security/mac/mac_framework.h>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
