diff options
| author | peter <peter@FreeBSD.org> | 1999-09-26 18:44:29 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-09-26 18:44:29 +0000 |
| commit | 08f3dd54013dead522f9885679ae165780275590 (patch) | |
| tree | eb6d1a08ca494e636345f3d928c3b3f064b7edab | |
| parent | 31831e3e3cd912505d8247e5788c33fbb67eba45 (diff) | |
| download | FreeBSD-src-08f3dd54013dead522f9885679ae165780275590.zip FreeBSD-src-08f3dd54013dead522f9885679ae165780275590.tar.gz | |
Minor tidy up of PPP_FILTER and NBPF stuff. Don't generate bpf.h in the
module and don't #include "bpf.h".
| -rw-r--r-- | sys/modules/if_ppp/Makefile | 7 | ||||
| -rw-r--r-- | sys/net/if_ppp.c | 8 |
2 files changed, 3 insertions, 12 deletions
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile index 4f429df..42d98a8 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 edcc575a..1db8237 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 |
