Minor tidy up of PPP_FILTER and NBPF stuff. Don't generate bpf.h in the

module and don't #include "bpf.h".

2 files changed, 3 insertions, 12 deletions

diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile
index 4f429dfab299..42d98a8b4b82 100644
--- a/sys/modules/if_ppp/Makefile
+++ b/sys/modules/if_ppp/Makefile
@@ -3,7 +3,7 @@
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_ppp
 SRCS=	if_ppp.c ppp_tty.c slcompress.c \
-	bpf.h ppp.h opt_inet.h opt_ipx.h opt_ppp.h vnode_if.h
+	ppp.h opt_inet.h opt_ipx.h opt_ppp.h vnode_if.h
 NOMAN=
 CLEANFILES+=	vnode_if.c vnode_if.h
 
@@ -23,10 +23,7 @@ SRCS+=	bsd_comp.c
 SRCS+=	ppp_deflate.c zlib.c
 .endif
 
-CLEANFILES+=	bpf.h opt_inet.h opt_ipx.h opt_ppp.h ppp.h
-
-bpf.h:
-	echo "#define NBPF ${PPP_FILTER}" > bpf.h
+CLEANFILES+=	opt_inet.h opt_ipx.h opt_ppp.h ppp.h
 
 ppp.h:
 	echo "#define NPPP ${NPPP}" > ppp.h
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index edcc575a804e..1db8237fb7ec 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -99,6 +99,7 @@
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
+#include <net/bpf.h>
 
 #if INET
 #include <netinet/in.h>
@@ -112,13 +113,6 @@
 #include <netipx/ipx_if.h>
 #endif
 
-#include "bpf.h"
-#include <net/bpf.h>
-
-#if defined(PPP_FILTER) && NBPF == 0
-#error "PPP_FILTER requires bpf"
-#endif
-
 #ifdef VJC
 #include <net/slcompress.h>
 #endif