svn commit: r228811 - in head/sys: contrib/pf/net modules/pfsync
Gleb Smirnoff
glebius at FreeBSD.org
Thu Dec 22 18:31:48 UTC 2011
Author: glebius
Date: Thu Dec 22 18:31:47 2011
New Revision: 228811
URL: http://svn.freebsd.org/changeset/base/228811
Log:
In FreeBSD we always have bpf(4) API, either real or stub. No need
in detecting presense of 'device bpf'.
Modified:
head/sys/contrib/pf/net/if_pfsync.c
head/sys/modules/pfsync/Makefile
Modified: head/sys/contrib/pf/net/if_pfsync.c
==============================================================================
--- head/sys/contrib/pf/net/if_pfsync.c Thu Dec 22 18:12:51 2011 (r228810)
+++ head/sys/contrib/pf/net/if_pfsync.c Thu Dec 22 18:31:47 2011 (r228811)
@@ -45,17 +45,12 @@
#ifdef __FreeBSD__
#include "opt_inet.h"
#include "opt_inet6.h"
-#include "opt_bpf.h"
#include "opt_pf.h"
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#ifdef DEV_BPF
-#define NBPFILTER DEV_BPF
-#else
-#define NBPFILTER 0
-#endif
+#define NBPFILTER 1
#ifdef DEV_PFSYNC
#define NPFSYNC DEV_PFSYNC
Modified: head/sys/modules/pfsync/Makefile
==============================================================================
--- head/sys/modules/pfsync/Makefile Thu Dec 22 18:12:51 2011 (r228810)
+++ head/sys/modules/pfsync/Makefile Thu Dec 22 18:31:47 2011 (r228811)
@@ -6,7 +6,7 @@
KMOD= pfsync
SRCS= if_pfsync.c \
- opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h
+ opt_pf.h opt_inet.h opt_inet6.h
CFLAGS+= -I${.CURDIR}/../../contrib/pf
SRCS+= bus_if.h device_if.h
@@ -24,9 +24,6 @@ opt_inet6.h:
echo "#define INET6 1" > ${.TARGET}
.endif
-opt_bpf.h:
- echo "#define DEV_BPF 1" > ${.TARGET}
-
.if defined(VIMAGE)
opt_global.h:
echo "#define VIMAGE 1" >> ${.TARGET}
More information about the svn-src-all
mailing list