diff options
| -rw-r--r-- | sys/netinet/ip_fw_pfil.c | 8 | ||||
| -rw-r--r-- | sys/netinet/ip_input.c | 12 |
2 files changed, 8 insertions, 12 deletions
diff --git a/sys/netinet/ip_fw_pfil.c b/sys/netinet/ip_fw_pfil.c index a58f96fe9040..b0cf77e00591 100644 --- a/sys/netinet/ip_fw_pfil.c +++ b/sys/netinet/ip_fw_pfil.c @@ -80,6 +80,14 @@ 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 84768a7f2d58..99d4566b8c08 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -77,10 +77,6 @@ #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; @@ -192,14 +188,6 @@ 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 *); /* |