18 files changed, 36 insertions, 90 deletions
diff --git a/sys/modules/al/Makefile b/sys/modules/al/Makefile
index 7147e14..79cdb3f 100644
--- a/sys/modules/al/Makefile
+++ b/sys/modules/al/Makefile
@@ -3,9 +3,9 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= al
-SRCS	= if_al.c al.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_al.c al.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= al.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= al.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
@@ -13,9 +13,6 @@ KMODDEPS = miibus
 al.h:
 	echo "#define NAL 1" > al.h
 
-bpf.h:
-	echo "#define NBPF 1" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/ax/Makefile b/sys/modules/ax/Makefile
index bf18b13..09e7197 100644
--- a/sys/modules/ax/Makefile
+++ b/sys/modules/ax/Makefile
@@ -3,16 +3,13 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_ax
-SRCS	= if_ax.c ax.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
-CLEANFILES	+= ax.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_ax.c ax.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= ax.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 
 ax.h:
 	echo "#define NAX 1" > ax.h
 
-bpf.h:
-	echo "#define NBPF 1" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/dm/Makefile b/sys/modules/dm/Makefile
index f4fac6e..711e5bd 100644
--- a/sys/modules/dm/Makefile
+++ b/sys/modules/dm/Makefile
@@ -3,9 +3,9 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_dm
-SRCS	= if_dm.c dm.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_dm.c dm.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= dm.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= dm.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
@@ -13,9 +13,6 @@ KMODDEPS = miibus
 dm.h:
 	echo "#define NDM 1" > dm.h
 
-bpf.h:
-	echo "#define NBPF 1" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/fxp/Makefile b/sys/modules/fxp/Makefile
index 715280d..7171508 100644
--- a/sys/modules/fxp/Makefile
+++ b/sys/modules/fxp/Makefile
@@ -3,16 +3,13 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_fxp
-SRCS	= if_fxp.c fxp.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
-CLEANFILES	+= fxp.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_fxp.c fxp.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= fxp.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 
 fxp.h:
 	echo "#define NFXP 1" > fxp.h
 
-bpf.h:
-	echo "#define NBPF 0" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile
index e5df9a6..71d9e7d 100644
--- a/sys/modules/if_disc/Makefile
+++ b/sys/modules/if_disc/Makefile
@@ -2,16 +2,13 @@
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_disc
-SRCS=   if_disc.c bpf.h	opt_inet.h
+SRCS=   if_disc.c opt_inet.h
 NOMAN=
 
 NBPF?=	1
 
 CFLAGS+= ${PROTOS}
-CLEANFILES+=	bpf.h	opt_inet.h
-
-bpf.h:
-	echo "#define NBPF ${NBPF}" > bpf.h
+CLEANFILES+=	opt_inet.h
 
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
diff --git a/sys/modules/if_sl/Makefile b/sys/modules/if_sl/Makefile
index 5d177c3..70f55ae 100644
--- a/sys/modules/if_sl/Makefile
+++ b/sys/modules/if_sl/Makefile
@@ -2,7 +2,7 @@
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_sl
-SRCS=   if_sl.c slcompress.c bpf.h opt_inet.h sl.h
+SRCS=   if_sl.c slcompress.c opt_inet.h sl.h
 NOMAN=
 
 NBPF?=	1
@@ -10,10 +10,7 @@ NSL?=		2
 PROTOS?=	-DINET
 
 CFLAGS+= ${PROTOS}
-CLEANFILES+=	bpf.h opt_inet.h sl.h
-
-bpf.h:
-	echo "#define NBPF ${NBPF}" > bpf.h
+CLEANFILES+=	opt_inet.h sl.h
 
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index 038ef19..fe5ee29 100644
--- a/sys/modules/if_tun/Makefile
+++ b/sys/modules/if_tun/Makefile
@@ -2,7 +2,7 @@
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_tun
-SRCS=   if_tun.c bpf.h opt_devfs.h opt_inet.h tun.h vnode_if.h
+SRCS=   if_tun.c opt_devfs.h opt_inet.h tun.h vnode_if.h
 NOMAN=
 CLEANFILES+=	vnode_if.h vnode_if.c
 
@@ -10,10 +10,7 @@ NBPF?=	1
 NTUN?=		2
 
 CFLAGS+= ${PROTOS}
-CLEANFILES+=	bpf.h opt_devfs.h opt_inet.h tun.h
-
-bpf.h:
-	echo "#define NBPF ${NBPF}" > bpf.h
+CLEANFILES+=	opt_devfs.h opt_inet.h tun.h
 
 opt_devfs.h:
 	touch opt_devfs.h
diff --git a/sys/modules/mx/Makefile b/sys/modules/mx/Makefile
index 0e745d1..a44c6f2 100644
--- a/sys/modules/mx/Makefile
+++ b/sys/modules/mx/Makefile
@@ -3,16 +3,13 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_mx
-SRCS	= if_mx.c mx.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
-CLEANFILES	+= mx.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_mx.c mx.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= mx.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 
 mx.h:
 	echo "#define NMX 1" > mx.h
 
-bpf.h:
-	echo "#define NBPF 1" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/pn/Makefile b/sys/modules/pn/Makefile
index 02e5291..d07b1d8 100644
--- a/sys/modules/pn/Makefile
+++ b/sys/modules/pn/Makefile
@@ -3,16 +3,13 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_pn
-SRCS	= if_pn.c pn.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
-CLEANFILES	+= pn.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_pn.c pn.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= pn.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 
 pn.h:
 	echo "#define NFXP 1" > pn.h
 
-bpf.h:
-	echo "#define NBPF 1" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/sf/Makefile b/sys/modules/sf/Makefile
index b58ed5b..2239014 100644
--- a/sys/modules/sf/Makefile
+++ b/sys/modules/sf/Makefile
@@ -3,9 +3,9 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_sf
-SRCS	= if_sf.c sf.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_sf.c sf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= sf.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= sf.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 KMODDEPS = miibus
 
@@ -14,9 +14,6 @@ CFLAGS	+= ${DEBUG_FLAGS}
 sf.h:
 	echo "#define NSF 1" > sf.h
 
-bpf.h:
-	echo "#define NBPF 1" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/sis/Makefile b/sys/modules/sis/Makefile
index 3757203..f2a2466 100644
--- a/sys/modules/sis/Makefile
+++ b/sys/modules/sis/Makefile
@@ -3,9 +3,9 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_sis
-SRCS	= if_sis.c sis.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_sis.c sis.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= sis.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= sis.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
@@ -13,9 +13,6 @@ KMODDEPS = miibus
 sis.h:
 	echo "#define NSIS 1" > sis.h
 
-bpf.h:
-	echo "#define NBPF 1" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/sk/Makefile b/sys/modules/sk/Makefile
index b45da92..c282093 100644
--- a/sys/modules/sk/Makefile
+++ b/sys/modules/sk/Makefile
@@ -3,16 +3,13 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_sk
-SRCS	= if_sk.c sk.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
-CLEANFILES	+= sk.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_sk.c sk.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= sk.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 
 sk.h:
 	echo "#define NSK 1" > sk.h
 
-bpf.h:
-	echo "#define NBPF 1" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/ste/Makefile b/sys/modules/ste/Makefile
index 3ed85a2..302e82b 100644
--- a/sys/modules/ste/Makefile
+++ b/sys/modules/ste/Makefile
@@ -3,9 +3,9 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_ste
-SRCS	= if_ste.c ste.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_ste.c ste.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= ste.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= ste.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
@@ -13,9 +13,6 @@ KMODDEPS = miibus
 ste.h:
 	echo "#define NSTE 1" > ste.h
 
-bpf.h:
-	echo "#define NBPF 1" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/ti/Makefile b/sys/modules/ti/Makefile
index 44efe9f..1691477 100644
--- a/sys/modules/ti/Makefile
+++ b/sys/modules/ti/Makefile
@@ -3,16 +3,13 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_ti
-SRCS	= if_ti.c ti.h bpf.h opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h
-CLEANFILES	+= ti.h bpf.h opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h
+SRCS	= if_ti.c ti.h opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= ti.h opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 
 ti.h:
 	echo "#define NTI 1" > ti.h
 
-bpf.h:
-	echo "#define NBPF 1" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/tl/Makefile b/sys/modules/tl/Makefile
index 2ae6f89..5d0587e 100644
--- a/sys/modules/tl/Makefile
+++ b/sys/modules/tl/Makefile
@@ -3,9 +3,9 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_tl
-SRCS	= if_tl.c tl.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_tl.c tl.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= tl.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= tl.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILEs	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
@@ -13,9 +13,6 @@ KMODDEPS = miibus
 tl.h:
 	echo "#define NTL 1" > tl.h
 
-bpf.h:
-	echo "#define NBPF 1" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/vr/Makefile b/sys/modules/vr/Makefile
index 0d81501..034175c 100644
--- a/sys/modules/vr/Makefile
+++ b/sys/modules/vr/Makefile
@@ -3,9 +3,9 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_vr
-SRCS	= if_vr.c vr.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_vr.c vr.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= vr.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= vr.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 KMODDEPS = miibus
 
@@ -14,9 +14,6 @@ CFLAGS	+= ${DEBUG_FLAGS}
 vr.h:
 	echo "#define NVR 1" > vr.h
 
-bpf.h:
-	echo "#define NBPF 1" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/wb/Makefile b/sys/modules/wb/Makefile
index 2a07c3e..c76f3df 100644
--- a/sys/modules/wb/Makefile
+++ b/sys/modules/wb/Makefile
@@ -3,9 +3,9 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_wb
-SRCS	= if_wb.c wb.h bpf.h opt_bdg.h device_if.h
+SRCS	= if_wb.c wb.h opt_bdg.h device_if.h
 SRCS	+= bus_if.h miibus_if.h pci_if.h
-CLEANFILES	+= wb.h bpf.h opt_bdg.h device_if.h
+CLEANFILES	+= wb.h opt_bdg.h device_if.h
 CLEANFILES	+= bus_if.h miibus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
@@ -13,9 +13,6 @@ KMODDEPS = miibus
 wb.h:
 	echo "#define NWB 1" > wb.h
 
-bpf.h:
-	echo "#define NBPF 1" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/xl/Makefile b/sys/modules/xl/Makefile
index e33d36d..ffdb37f9 100644
--- a/sys/modules/xl/Makefile
+++ b/sys/modules/xl/Makefile
@@ -3,9 +3,9 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_xl
-SRCS	= if_xl.c xl.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_xl.c xl.h opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= xl.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= xl.h opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
@@ -13,9 +13,6 @@ KMODDEPS = miibus
 xl.h:
 	echo "#define NXL 1" > xl.h
 
-bpf.h:
-	echo "#define NBPF 1" > bpf.h
-
 opt_bdg.h:
 	touch opt_bdg.h