From 8f92fe04c3829512304e750aec70de2de57b0897 Mon Sep 17 00:00:00 2001
From: julian <julian@FreeBSD.org>
Date: Sat, 21 Oct 2006 00:16:31 +0000
Subject: revert last change.. premature.. need to wait until if_ethersubr.c
 uses pfil to get to ipfw.

---
 sys/netinet/ip_fw_pfil.c |  8 --------
 sys/netinet/ip_input.c   | 12 ++++++++++++
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'sys/netinet')

diff --git a/sys/netinet/ip_fw_pfil.c b/sys/netinet/ip_fw_pfil.c
index b0cf77e..a58f96f 100644
--- a/sys/netinet/ip_fw_pfil.c
+++ b/sys/netinet/ip_fw_pfil.c
@@ -80,14 +80,6 @@ ip_divert_packet_t *ip_divert_ptr = NULL;
 /* ng_ipfw hooks. */
 ng_ipfw_input_t *ng_ipfw_input_p = NULL;
 
-/*
- * ipfw_ether and ipfw_bridge hooks.
- * XXX: Temporary until those are converted to pfil_hooks as well.
- */
-ip_fw_chk_t *ip_fw_chk_ptr = NULL;
-ip_dn_io_t *ip_dn_io_ptr = NULL;
-int fw_one_pass = 1;
-
 /* Forward declarations. */
 static int	ipfw_divert(struct mbuf **, int, int);
 #define	DIV_DIR_IN	1
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 99d4566..84768a7 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -77,6 +77,10 @@
 
 #include <sys/socketvar.h>
 
+/* XXX: Temporary until ipfw_ether and ipfw_bridge are converted. */
+#include <netinet/ip_fw.h>
+#include <netinet/ip_dummynet.h>
+
 int rsvp_on = 0;
 
 int	ipforwarding = 0;
@@ -188,6 +192,14 @@ SYSCTL_INT(_net_inet_ip, OID_AUTO, stealth, CTLFLAG_RW,
     &ipstealth, 0, "");
 #endif
 
+/*
+ * ipfw_ether and ipfw_bridge hooks.
+ * XXX: Temporary until those are converted to pfil_hooks as well.
+ */
+ip_fw_chk_t *ip_fw_chk_ptr = NULL;
+ip_dn_io_t *ip_dn_io_ptr = NULL;
+int fw_one_pass = 1;
+
 static void	ip_freef(struct ipqhead *, struct ipq *);
 
 /*
-- 
cgit v1.1