summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordarrenr <darrenr@FreeBSD.org>2005-05-15 03:34:17 +0000
committerdarrenr <darrenr@FreeBSD.org>2005-05-15 03:34:17 +0000
commit2e784092b665281139996ed328c8655147601212 (patch)
tree96f258a72ccf2d397856fd857413f6ae1957fd50
parentc853caca3e5fddae2276561f74356a4ec54783e0 (diff)
downloadFreeBSD-src-2e784092b665281139996ed328c8655147601212.zip
FreeBSD-src-2e784092b665281139996ed328c8655147601212.tar.gz
Enable IPFilter to correctly determine if BPF has been optioned into the
kernel it is being compiled against and subsequently enable using BPF for packet matching in ipf rules.
-rw-r--r--sys/contrib/ipfilter/netinet/ip_compat.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h
index 1da588d..14c1189 100644
--- a/sys/contrib/ipfilter/netinet/ip_compat.h
+++ b/sys/contrib/ipfilter/netinet/ip_compat.h
@@ -769,7 +769,7 @@ typedef u_int32_t u_32_t;
/* F R E E B S D */
/* ----------------------------------------------------------------------- */
#ifdef __FreeBSD__
-# if defined(_KERNEL) && !defined(IPFILTER_LKM) && !defined(KLD_MODULE)
+# if defined(_KERNEL)
# if (__FreeBSD_version >= 500000)
# include "opt_bpf.h"
# else
@@ -1222,7 +1222,7 @@ typedef u_int32_t u_32_t;
* For BSD kernels, if bpf is in the kernel, enable ipfilter to use bpf in
* filter rules.
*/
-#if !defined(IPFILTER_BPF) && ((NBPF > 0) || (NBPFILTER > 0))
+#if !defined(IPFILTER_BPF) && ((NBPF > 0) || (NBPFILTER > 0) || (DEV_BPF >0))
# define IPFILTER_BPF
#endif
OpenPOWER on IntegriCloud