aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--release/picobsd/router/conf/PICOBSD4
-rw-r--r--share/man/man4/bpf.44
-rw-r--r--sys/amd64/conf/GENERIC6
-rw-r--r--sys/conf/NOTES6
-rw-r--r--sys/conf/files3
-rw-r--r--sys/i386/conf/GENERIC6
-rw-r--r--sys/i386/conf/LINT6
-rw-r--r--sys/i386/conf/NOTES6
-rw-r--r--sys/i386/conf/SMP-GENERIC6
-rw-r--r--sys/pc98/conf/GENERIC6
-rw-r--r--sys/pc98/conf/GENERIC986
-rw-r--r--sys/pc98/conf/SMP-GENERIC986
12 files changed, 34 insertions, 31 deletions
diff --git a/release/picobsd/router/conf/PICOBSD b/release/picobsd/router/conf/PICOBSD
index 6184fe8d7d89..2fcff5d55b67 100644
--- a/release/picobsd/router/conf/PICOBSD
+++ b/release/picobsd/router/conf/PICOBSD
@@ -1,5 +1,5 @@
#
-# $Id: PICOBSD,v 1.6 1998/09/24 16:39:55 abial Exp $
+# $Id: PICOBSD,v 1.7 1998/10/25 15:31:26 abial Exp $
#
machine "i386"
@@ -86,7 +86,7 @@ pseudo-device loop
pseudo-device ether
#pseudo-device tun 2
#pseudo-device vn
-#pseudo-device bpfilter 4
+#pseudo-device bpf 4
pseudo-device ppp 4
pseudo-device pty 16
#pseudo-device gzip # Exec gzipped a.out's
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index c70ec943ebc2..56e845e75068 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -20,7 +20,7 @@
.\" This document is derived in part from the enet man page (enet.4)
.\" distributed with 4.3BSD Unix.
.\"
-.\" $Id: bpf.4,v 1.12 1998/03/12 07:30:16 charnier Exp $
+.\" $Id: bpf.4,v 1.13 1998/05/25 07:11:41 jkoshy Exp $
.\"
.Dd January 16, 1996
.Dt BPF 4
@@ -29,7 +29,7 @@
.Nm bpf
.Nd Berkeley Packet Filter
.Sh SYNOPSIS
-.Cd pseudo-device bpfilter
+.Cd pseudo-device bpf
.Sh DESCRIPTION
The Berkeley Packet Filter
provides a raw interface to data link layers in a protocol
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 6b4dddcc4ee3..9444a4778d0e 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: GENERIC,v 1.127 1998/10/22 12:23:03 bde Exp $
+# $Id: GENERIC,v 1.128 1998/10/22 13:49:51 bde Exp $
machine "i386"
cpu "I386_CPU"
@@ -178,8 +178,8 @@ options KTRACE #kernel tracing
#
options SYSVSHM
-# The `bpfilter' pseudo-device enables the Berkeley Packet Filter. Be
+# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# aware of the legal and administrative consequences of enabling this
# option. The number of devices determines the maximum number of
# simultaneous BPF clients programs runnable.
-#pseudo-device bpfilter 4 #Berkeley packet filter
+#pseudo-device bpf 4 #Berkeley packet filter
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 800b0bdd7ec1..c16ccd6ccca7 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.494 1998/11/01 18:41:21 nsouch Exp $
+# $Id: LINT,v 1.495 1998/11/01 18:47:18 nsouch Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -362,7 +362,7 @@ options NETATALK #Appletalk communications protocols
# of synchronous PPP links (like `cx', `ar').
# The `sl' pseudo-device implements the Serial Line IP (SLIP) service.
# The `ppp' pseudo-device implements the Point-to-Point Protocol.
-# The `bpfilter' pseudo-device enables the Berkeley Packet Filter. Be
+# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# aware of the legal and administrative consequences of enabling this
# option. The number of devices determines the maximum number of
# simultaneous BPF clients programs runnable.
@@ -381,7 +381,7 @@ pseudo-device ether #Generic Ethernet
pseudo-device fddi #Generic FDDI
pseudo-device sppp #Generic Synchronous PPP
pseudo-device loop #Network loopback device
-pseudo-device bpfilter 4 #Berkeley packet filter
+pseudo-device bpf 4 #Berkeley packet filter
pseudo-device disc #Discard device
pseudo-device tun 1 #Tunnel driver (user process ppp(8))
pseudo-device sl 2 #Serial Line IP
diff --git a/sys/conf/files b/sys/conf/files
index f451fc119987..3e943eb27179 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -333,8 +333,11 @@ msdosfs/msdosfs_fat.c optional msdosfs
msdosfs/msdosfs_lookup.c optional msdosfs
msdosfs/msdosfs_vfsops.c optional msdosfs
msdosfs/msdosfs_vnops.c optional msdosfs
+# bpfilter is deprecated and will go away soon; use bpf instead.
net/bpf.c optional bpfilter
net/bpf_filter.c optional bpfilter
+net/bpf.c optional bpf
+net/bpf_filter.c optional bpf
net/bsd_comp.c optional ppp_bsdcomp
#net/hostcache.c standard
net/if.c standard
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 6b4dddcc4ee3..9444a4778d0e 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: GENERIC,v 1.127 1998/10/22 12:23:03 bde Exp $
+# $Id: GENERIC,v 1.128 1998/10/22 13:49:51 bde Exp $
machine "i386"
cpu "I386_CPU"
@@ -178,8 +178,8 @@ options KTRACE #kernel tracing
#
options SYSVSHM
-# The `bpfilter' pseudo-device enables the Berkeley Packet Filter. Be
+# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# aware of the legal and administrative consequences of enabling this
# option. The number of devices determines the maximum number of
# simultaneous BPF clients programs runnable.
-#pseudo-device bpfilter 4 #Berkeley packet filter
+#pseudo-device bpf 4 #Berkeley packet filter
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 800b0bdd7ec1..c16ccd6ccca7 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.494 1998/11/01 18:41:21 nsouch Exp $
+# $Id: LINT,v 1.495 1998/11/01 18:47:18 nsouch Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -362,7 +362,7 @@ options NETATALK #Appletalk communications protocols
# of synchronous PPP links (like `cx', `ar').
# The `sl' pseudo-device implements the Serial Line IP (SLIP) service.
# The `ppp' pseudo-device implements the Point-to-Point Protocol.
-# The `bpfilter' pseudo-device enables the Berkeley Packet Filter. Be
+# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# aware of the legal and administrative consequences of enabling this
# option. The number of devices determines the maximum number of
# simultaneous BPF clients programs runnable.
@@ -381,7 +381,7 @@ pseudo-device ether #Generic Ethernet
pseudo-device fddi #Generic FDDI
pseudo-device sppp #Generic Synchronous PPP
pseudo-device loop #Network loopback device
-pseudo-device bpfilter 4 #Berkeley packet filter
+pseudo-device bpf 4 #Berkeley packet filter
pseudo-device disc #Discard device
pseudo-device tun 1 #Tunnel driver (user process ppp(8))
pseudo-device sl 2 #Serial Line IP
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 800b0bdd7ec1..c16ccd6ccca7 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.494 1998/11/01 18:41:21 nsouch Exp $
+# $Id: LINT,v 1.495 1998/11/01 18:47:18 nsouch Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -362,7 +362,7 @@ options NETATALK #Appletalk communications protocols
# of synchronous PPP links (like `cx', `ar').
# The `sl' pseudo-device implements the Serial Line IP (SLIP) service.
# The `ppp' pseudo-device implements the Point-to-Point Protocol.
-# The `bpfilter' pseudo-device enables the Berkeley Packet Filter. Be
+# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# aware of the legal and administrative consequences of enabling this
# option. The number of devices determines the maximum number of
# simultaneous BPF clients programs runnable.
@@ -381,7 +381,7 @@ pseudo-device ether #Generic Ethernet
pseudo-device fddi #Generic FDDI
pseudo-device sppp #Generic Synchronous PPP
pseudo-device loop #Network loopback device
-pseudo-device bpfilter 4 #Berkeley packet filter
+pseudo-device bpf 4 #Berkeley packet filter
pseudo-device disc #Discard device
pseudo-device tun 1 #Tunnel driver (user process ppp(8))
pseudo-device sl 2 #Serial Line IP
diff --git a/sys/i386/conf/SMP-GENERIC b/sys/i386/conf/SMP-GENERIC
index ec1bea10d90d..645f77d9b23c 100644
--- a/sys/i386/conf/SMP-GENERIC
+++ b/sys/i386/conf/SMP-GENERIC
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: SMP-GENERIC,v 1.19 1998/10/22 12:23:04 bde Exp $
+# $Id: SMP-GENERIC,v 1.20 1998/10/22 13:49:51 bde Exp $
machine "i386"
# SMP does NOT support 386/486 CPUs.
@@ -195,8 +195,8 @@ options KTRACE #kernel tracing
#
options SYSVSHM
-# The `bpfilter' pseudo-device enables the Berkeley Packet Filter. Be
+# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# aware of the legal and administrative consequences of enabling this
# option. The number of devices determines the maximum number of
# simultaneous BPF clients programs runnable.
-#pseudo-device bpfilter 4 #Berkeley packet filter
+#pseudo-device bpf 4 #Berkeley packet filter
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 951c7a6ca9d5..0a26e48fa536 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: GENERIC98,v 1.53 1998/10/22 11:29:54 kato Exp $
+# $Id: GENERIC98,v 1.54 1998/10/22 16:16:02 bde Exp $
# GENERIC98 -- Generic PC98 machine with WD/SCSI disks
@@ -171,11 +171,11 @@ device vx0
#
device ed0 at isa? port 0x00d0 net irq 6
-# The `bpfilter' pseudo-device enables the Berkeley Packet Filter. Be
+# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# aware of the legal and administrative consequences of enabling this
# option. The number of devices determines the maximum number of
# simultaneous BPF clients programs runnable.
-#pseudo-device bpfilter 4 #Berkeley packet filter
+#pseudo-device bpf 4 #Berkeley packet filter
device ed1 at isa? port 0x00d8 net irq 6 flags 0x200000
device ed2 at isa? port 0x00d8 net irq 6 flags 0x300000
device ed3 at isa? port 0x00d0 net irq 6 flags 0x400000
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index 951c7a6ca9d5..0a26e48fa536 100644
--- a/sys/pc98/conf/GENERIC98
+++ b/sys/pc98/conf/GENERIC98
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: GENERIC98,v 1.53 1998/10/22 11:29:54 kato Exp $
+# $Id: GENERIC98,v 1.54 1998/10/22 16:16:02 bde Exp $
# GENERIC98 -- Generic PC98 machine with WD/SCSI disks
@@ -171,11 +171,11 @@ device vx0
#
device ed0 at isa? port 0x00d0 net irq 6
-# The `bpfilter' pseudo-device enables the Berkeley Packet Filter. Be
+# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# aware of the legal and administrative consequences of enabling this
# option. The number of devices determines the maximum number of
# simultaneous BPF clients programs runnable.
-#pseudo-device bpfilter 4 #Berkeley packet filter
+#pseudo-device bpf 4 #Berkeley packet filter
device ed1 at isa? port 0x00d8 net irq 6 flags 0x200000
device ed2 at isa? port 0x00d8 net irq 6 flags 0x300000
device ed3 at isa? port 0x00d0 net irq 6 flags 0x400000
diff --git a/sys/pc98/conf/SMP-GENERIC98 b/sys/pc98/conf/SMP-GENERIC98
index 87e3a2fedbd9..0f226e16fbd2 100644
--- a/sys/pc98/conf/SMP-GENERIC98
+++ b/sys/pc98/conf/SMP-GENERIC98
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: SMP-GENERIC98,v 1.8 1998/10/22 11:29:55 kato Exp $
+# $Id: SMP-GENERIC98,v 1.9 1998/10/22 16:16:02 bde Exp $
# GENERIC98 -- Generic PC98 machine with WD/SCSI disks
@@ -235,8 +235,8 @@ options KTRACE #kernel tracing
#
options SYSVSHM
-# The `bpfilter' pseudo-device enables the Berkeley Packet Filter. Be
+# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# aware of the legal and administrative consequences of enabling this
# option. The number of devices determines the maximum number of
# simultaneous BPF clients programs runnable.
-#pseudo-device bpfilter 4 #Berkeley packet filter
+#pseudo-device bpf 4 #Berkeley packet filter