diff options
| -rw-r--r-- | lib/libnetgraph/debug.c | 2 | ||||
| -rw-r--r-- | sys/netgraph/ng_ipfw.h | 1 | ||||
| -rw-r--r-- | sys/netinet/ipfw/ip_fw_pfil.c | 1 | ||||
| -rw-r--r-- | sys/netinet/ipfw/ip_fw_private.h | 1 |
4 files changed, 2 insertions, 3 deletions
diff --git a/lib/libnetgraph/debug.c b/lib/libnetgraph/debug.c index 90efc55..dfc75f5 100644 --- a/lib/libnetgraph/debug.c +++ b/lib/libnetgraph/debug.c @@ -76,8 +76,6 @@ __FBSDID("$FreeBSD$"); #include <netgraph/ng_hub.h> #include <netgraph/ng_iface.h> #include <netgraph/ng_ip_input.h> -#include <netinet/ip_fw.h> -#include <netinet/ip_fw_private.h> /* the NGM cookie is here */ #include <netgraph/ng_ipfw.h> #include <netgraph/ng_ksocket.h> #include <netgraph/ng_l2tp.h> diff --git a/sys/netgraph/ng_ipfw.h b/sys/netgraph/ng_ipfw.h index c463d6a..c2cab6a 100644 --- a/sys/netgraph/ng_ipfw.h +++ b/sys/netgraph/ng_ipfw.h @@ -29,4 +29,5 @@ #ifndef _NG_IPFW_H #define _NG_IPFW_H #define NG_IPFW_NODE_TYPE "ipfw" +#define NGM_IPFW_COOKIE 1105988990 #endif /* _NG_IPFW_H */ diff --git a/sys/netinet/ipfw/ip_fw_pfil.c b/sys/netinet/ipfw/ip_fw_pfil.c index f59d341..21e9f58 100644 --- a/sys/netinet/ipfw/ip_fw_pfil.c +++ b/sys/netinet/ipfw/ip_fw_pfil.c @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/ipfw/ip_fw_private.h> #include <netinet/ip_divert.h> #include <netinet/ip_dummynet.h> +#include <netgraph/ng_ipfw.h> #include <machine/in_cksum.h> diff --git a/sys/netinet/ipfw/ip_fw_private.h b/sys/netinet/ipfw/ip_fw_private.h index 780d16e..aa1dc57 100644 --- a/sys/netinet/ipfw/ip_fw_private.h +++ b/sys/netinet/ipfw/ip_fw_private.h @@ -272,7 +272,6 @@ extern ipfw_nat_cfg_t *ipfw_nat_get_cfg_ptr; extern ipfw_nat_cfg_t *ipfw_nat_get_log_ptr; /* netgraph prototypes */ -#define NGM_IPFW_COOKIE 1105988990 typedef int ng_ipfw_input_t(struct mbuf **, int, struct ip_fw_args *, int); extern ng_ipfw_input_t *ng_ipfw_input_p; |
