summaryrefslogtreecommitdiffstats
path: root/sys/contrib/ipfilter/netinet
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2008-12-02 21:37:28 +0000
committerbz <bz@FreeBSD.org>2008-12-02 21:37:28 +0000
commit604d89458ab94ec81eaefa2d55ef219cba461e31 (patch)
treee9bacc5bf23d71b60a706b2c5f58a92e6fb570cb /sys/contrib/ipfilter/netinet
parent94db7634b6344ba280905cbac5c04f1f92b41457 (diff)
downloadFreeBSD-src-604d89458ab94ec81eaefa2d55ef219cba461e31.zip
FreeBSD-src-604d89458ab94ec81eaefa2d55ef219cba461e31.tar.gz
Rather than using hidden includes (with cicular dependencies),
directly include only the header files needed. This reduces the unneeded spamming of various headers into lots of files. For now, this leaves us with very few modules including vnet.h and thus needing to depend on opt_route.h. Reviewed by: brooks, gnn, des, zec, imp Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/contrib/ipfilter/netinet')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_fil_freebsd.c3
-rw-r--r--sys/contrib/ipfilter/netinet/mlfk_ipl.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
index f0604b0..3bef15c 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
+++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
@@ -112,6 +112,9 @@ static const char rcsid[] = "@(#)$Id: ip_fil_freebsd.c,v 2.53.2.50 2007/09/20 12
#include "netinet/ip_scan.h"
#endif
#include "netinet/ip_pool.h"
+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800056)
+# include <netinet/vinet.h>
+#endif
#if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
# include <sys/malloc.h>
#endif
diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/contrib/ipfilter/netinet/mlfk_ipl.c
index 0b462d9..36048e4 100644
--- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c
+++ b/sys/contrib/ipfilter/netinet/mlfk_ipl.c
@@ -43,9 +43,7 @@ static int sysctl_ipf_int ( SYSCTL_HANDLER_ARGS );
static int ipf_modload(void);
static int ipf_modunload(void);
-#if __FreeBSD_version < 800055
SYSCTL_DECL(_net_inet);
-#endif
#define SYSCTL_IPF(parent, nbr, name, access, ptr, val, descr) \
SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \
ptr, val, sysctl_ipf_int, "I", descr);
OpenPOWER on IntegriCloud