svn commit: r229851 - head/sys/contrib/pf/net

[Gleb Smirnoff]

Author: glebius
Date: Mon Jan  9 08:55:23 2012
New Revision: 229851
URL: http://svn.freebsd.org/changeset/base/229851

Log:
  In FreeBSD we determine presence of pfsync(4) at run-time, not
  at compile time, so define NPFSYNC to 1 always. While here, remove
  unused defines.

Modified:
  head/sys/contrib/pf/net/if_pfsync.c
  head/sys/contrib/pf/net/pf.c
  head/sys/contrib/pf/net/pf_ioctl.c

Modified: head/sys/contrib/pf/net/if_pfsync.c
==============================================================================
--- head/sys/contrib/pf/net/if_pfsync.c	Mon Jan  9 08:50:22 2012	(r229850)
+++ head/sys/contrib/pf/net/if_pfsync.c	Mon Jan  9 08:55:23 2012	(r229851)
@@ -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>

Modified: head/sys/contrib/pf/net/pf.c
==============================================================================
--- head/sys/contrib/pf/net/pf.c	Mon Jan  9 08:50:22 2012	(r229850)
+++ head/sys/contrib/pf/net/pf.c	Mon Jan  9 08:55:23 2012	(r229851)
@@ -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

Modified: head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- head/sys/contrib/pf/net/pf_ioctl.c	Mon Jan  9 08:50:22 2012	(r229850)
+++ head/sys/contrib/pf/net/pf_ioctl.c	Mon Jan  9 08:55:23 2012	(r229851)
@@ -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>