diff options
| author | des <des@FreeBSD.org> | 1998-11-03 22:01:22 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 1998-11-03 22:01:22 +0000 |
| commit | d6ccde669813acbe659fed5461a943095931abed (patch) | |
| tree | 54396d5675775393c9e7e01f495a2ecb86d09697 /sys/conf | |
| parent | b38e7f90e18accdf48630bfee2b3a9400304bc67 (diff) | |
| download | FreeBSD-src-d6ccde669813acbe659fed5461a943095931abed.zip FreeBSD-src-d6ccde669813acbe659fed5461a943095931abed.tar.gz | |
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.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/NOTES | 6 | ||||
| -rw-r--r-- | sys/conf/files | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index c16ccd6..3e97c06 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.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 diff --git a/sys/conf/files b/sys/conf/files index 3e943eb..f451fc1 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -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 |
