d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In FreeBSD we determine presence of pfsync(4) at run-time, not

Browse Source 
at compile time, so define NPFSYNC to 1 always. While here, remove
unused defines.
This commit is contained in:
glebius 2012-01-09 08:55:23 +00:00
parent 7b863fa87e
commit a159343727
3 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/contrib/pf/net/if_pfsync.c
View File

@ -59,12 +59,6 @@
__FBSDID("$FreeBSD$");
#define NBPFILTER 1
#ifdef DEV_PFSYNC
#define NPFSYNC DEV_PFSYNC
#else
#define NPFSYNC 0
#endif
#endif /* __FreeBSD__ */
#include <sys/param.h>

18
sys/contrib/pf/net/pf.c
View File

@ -47,23 +47,7 @@ __FBSDID("$FreeBSD$");
#include "opt_bpf.h"
#include "opt_pf.h"
#ifdef DEV_BPF
#define NBPFILTER DEV_BPF
#else
#define NBPFILTER 0
#endif
#ifdef DEV_PFLOG
#define NPFLOG DEV_PFLOG
#else
#define NPFLOG 0
#endif
#ifdef DEV_PFSYNC
#define NPFSYNC DEV_PFSYNC
#else
#define NPFSYNC 0
#endif
#define NPFSYNC 1
#ifdef DEV_PFLOW
#define NPFLOW DEV_PFLOW

16
sys/contrib/pf/net/pf_ioctl.c
View File

@ -44,11 +44,7 @@ __FBSDID("$FreeBSD$");
#include "opt_bpf.h"
#include "opt_pf.h"
#ifdef DEV_BPF
#define NBPFILTER DEV_BPF
#else
#define NBPFILTER 0
#endif
#define NPFSYNC 1
#ifdef DEV_PFLOG
#define NPFLOG DEV_PFLOG
@ -56,16 +52,10 @@ __FBSDID("$FreeBSD$");
#define NPFLOG 0
#endif
#ifdef DEV_PFSYNC
#define NPFSYNC DEV_PFSYNC
#else
#define NPFSYNC 0
#endif
#else
#else /* !__FreeBSD__ */
#include "pfsync.h"
#include "pflog.h"
#endif
#endif /* __FreeBSD__ */
#include <sys/param.h>
#include <sys/systm.h>