Back out previous commit. The bpfilter -> bpf transition will have to be a

flag day unless we can hack config(8) to smooth things over.
This commit is contained in:
Dag-Erling Smørgrav 1998-11-03 22:01:22 +00:00
parent 10b4ab477f
commit fb46af4f6c
12 changed files with 31 additions and 34 deletions

View file

@ -1,5 +1,5 @@
#
# $Id: PICOBSD,v 1.7 1998/10/25 15:31:26 abial Exp $
# $Id: PICOBSD,v 1.8 1998/11/03 21:12:19 des Exp $
#
machine "i386"
@ -86,7 +86,7 @@ pseudo-device loop
pseudo-device ether
#pseudo-device tun 2
#pseudo-device vn
#pseudo-device bpf 4
#pseudo-device bpfilter 4
pseudo-device ppp 4
pseudo-device pty 16
#pseudo-device gzip # Exec gzipped a.out's

View file

@ -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.13 1998/05/25 07:11:41 jkoshy Exp $
.\" $Id: bpf.4,v 1.14 1998/11/03 21:12:19 des Exp $
.\"
.Dd January 16, 1996
.Dt BPF 4
@ -29,7 +29,7 @@
.Nm bpf
.Nd Berkeley Packet Filter
.Sh SYNOPSIS
.Cd pseudo-device bpf
.Cd pseudo-device bpfilter
.Sh DESCRIPTION
The Berkeley Packet Filter
provides a raw interface to data link layers in a protocol

View file

@ -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.128 1998/10/22 13:49:51 bde Exp $
# $Id: GENERIC,v 1.129 1998/11/03 21:12:20 des Exp $
machine "i386"
cpu "I386_CPU"
@ -178,8 +178,8 @@ options KTRACE #kernel tracing
#
options SYSVSHM
# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# The `bpfilter' 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 bpf 4 #Berkeley packet filter
#pseudo-device bpfilter 4 #Berkeley packet filter

View file

@ -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.495 1998/11/01 18:47:18 nsouch Exp $
# $Id: LINT,v 1.496 1998/11/03 21:12:20 des 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 `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# The `bpfilter' 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 bpf 4 #Berkeley packet filter
pseudo-device bpfilter 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

View file

@ -333,11 +333,8 @@ 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

View file

@ -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.128 1998/10/22 13:49:51 bde Exp $
# $Id: GENERIC,v 1.129 1998/11/03 21:12:20 des Exp $
machine "i386"
cpu "I386_CPU"
@ -178,8 +178,8 @@ options KTRACE #kernel tracing
#
options SYSVSHM
# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# The `bpfilter' 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 bpf 4 #Berkeley packet filter
#pseudo-device bpfilter 4 #Berkeley packet filter

View file

@ -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.495 1998/11/01 18:47:18 nsouch Exp $
# $Id: LINT,v 1.496 1998/11/03 21:12:20 des 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 `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# The `bpfilter' 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 bpf 4 #Berkeley packet filter
pseudo-device bpfilter 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

View file

@ -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.495 1998/11/01 18:47:18 nsouch Exp $
# $Id: LINT,v 1.496 1998/11/03 21:12:20 des 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 `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# The `bpfilter' 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 bpf 4 #Berkeley packet filter
pseudo-device bpfilter 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

View file

@ -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.20 1998/10/22 13:49:51 bde Exp $
# $Id: SMP-GENERIC,v 1.21 1998/11/03 21:12:20 des Exp $
machine "i386"
# SMP does NOT support 386/486 CPUs.
@ -195,8 +195,8 @@ options KTRACE #kernel tracing
#
options SYSVSHM
# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# The `bpfilter' 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 bpf 4 #Berkeley packet filter
#pseudo-device bpfilter 4 #Berkeley packet filter

View file

@ -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.54 1998/10/22 16:16:02 bde Exp $
# $Id: GENERIC98,v 1.55 1998/11/03 21:12:20 des 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 `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# The `bpfilter' 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 bpf 4 #Berkeley packet filter
#pseudo-device bpfilter 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

View file

@ -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.54 1998/10/22 16:16:02 bde Exp $
# $Id: GENERIC98,v 1.55 1998/11/03 21:12:20 des 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 `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# The `bpfilter' 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 bpf 4 #Berkeley packet filter
#pseudo-device bpfilter 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

View file

@ -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.9 1998/10/22 16:16:02 bde Exp $
# $Id: SMP-GENERIC98,v 1.10 1998/11/03 21:12:20 des Exp $
# GENERIC98 -- Generic PC98 machine with WD/SCSI disks
@ -235,8 +235,8 @@ options KTRACE #kernel tracing
#
options SYSVSHM
# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be
# The `bpfilter' 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 bpf 4 #Berkeley packet filter
#pseudo-device bpfilter 4 #Berkeley packet filter