diff options
-rw-r--r-- | etc/etc.alpha/MAKEDEV | 4 | ||||
-rw-r--r-- | etc/etc.amiga/MAKEDEV | 4 | ||||
-rw-r--r-- | etc/etc.hp300/MAKEDEV | 4 | ||||
-rw-r--r-- | etc/etc.hppa/MAKEDEV | 4 | ||||
-rw-r--r-- | etc/etc.mac68k/MAKEDEV | 4 | ||||
-rw-r--r-- | etc/etc.mvme68k/MAKEDEV | 6 | ||||
-rw-r--r-- | etc/etc.mvme88k/MAKEDEV | 4 | ||||
-rw-r--r-- | etc/etc.sparc/MAKEDEV | 4 | ||||
-rw-r--r-- | etc/etc.sun3/MAKEDEV | 4 | ||||
-rw-r--r-- | etc/etc.vax/MAKEDEV | 4 | ||||
-rw-r--r-- | sys/arch/alpha/alpha/conf.c | 5 | ||||
-rw-r--r-- | sys/arch/amiga/amiga/conf.c | 6 | ||||
-rw-r--r-- | sys/arch/hp300/hp300/conf.c | 12 | ||||
-rw-r--r-- | sys/arch/hppa/hppa/conf.c | 11 | ||||
-rw-r--r-- | sys/arch/i386/i386/conf.c | 10 | ||||
-rw-r--r-- | sys/arch/mac68k/mac68k/conf.c | 11 | ||||
-rw-r--r-- | sys/arch/mvme68k/mvme68k/conf.c | 11 | ||||
-rw-r--r-- | sys/arch/mvme88k/mvme88k/conf.c | 12 | ||||
-rw-r--r-- | sys/arch/powerpc/powerpc/conf.c | 11 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/conf.c | 7 | ||||
-rw-r--r-- | sys/arch/sun3/sun3/conf.c | 7 | ||||
-rw-r--r-- | sys/arch/vax/vax/conf.c | 13 |
22 files changed, 70 insertions, 88 deletions
diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV index b6fbf3f651f..3426a6a8eb3 100644 --- a/etc/etc.alpha/MAKEDEV +++ b/etc/etc.alpha/MAKEDEV @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: MAKEDEV,v 1.56 2001/06/24 23:35:56 kjell Exp $ +# $OpenBSD: MAKEDEV,v 1.57 2001/06/25 03:19:42 kjell Exp $ # $NetBSD: MAKEDEV,v 1.8.4.1 1996/06/18 00:41:56 cgd Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -483,7 +483,7 @@ bpf*) pf) rm -f pf - mknod pf c 73 0 + mknod pf c 35 0 chown root.wheel pf chmod 600 pf ;; diff --git a/etc/etc.amiga/MAKEDEV b/etc/etc.amiga/MAKEDEV index 3a973722006..035ac62b1a1 100644 --- a/etc/etc.amiga/MAKEDEV +++ b/etc/etc.amiga/MAKEDEV @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: MAKEDEV,v 1.48 2001/06/24 23:35:57 kjell Exp $ +# $OpenBSD: MAKEDEV,v 1.49 2001/06/25 03:19:47 kjell Exp $ # $NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -578,7 +578,7 @@ bpf*) pf) rm -f pf - mknod pf c 73 0 + mknod pf c 34 0 chown root.wheel pf chmod 600 pf ;; diff --git a/etc/etc.hp300/MAKEDEV b/etc/etc.hp300/MAKEDEV index 89a3e416c43..a147fe686d6 100644 --- a/etc/etc.hp300/MAKEDEV +++ b/etc/etc.hp300/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.33 2001/06/24 23:36:00 kjell Exp $ +# $OpenBSD: MAKEDEV,v 1.34 2001/06/25 03:19:52 kjell Exp $ # $NetBSD: MAKEDEV,v 1.12 1995/11/05 23:50:22 thorpej Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -191,7 +191,7 @@ bpf*) pf) rm -f pf - mknod pf c 73 0 + mknod pf c 33 0 chown root.wheel pf chmod 600 pf ;; diff --git a/etc/etc.hppa/MAKEDEV b/etc/etc.hppa/MAKEDEV index 07c1771a116..222edd4cc0b 100644 --- a/etc/etc.hppa/MAKEDEV +++ b/etc/etc.hppa/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.5 2001/06/24 23:36:01 kjell Exp $ +# $OpenBSD: MAKEDEV,v 1.6 2001/06/25 03:19:57 kjell Exp $ # @(#)MAKEDEV 5.5 (Berkeley) 5/28/91 # # Device "make" file. Valid arguments: @@ -183,7 +183,7 @@ bpf*) pf) rm -f pf - mknod pf c 73 0 + mknod pf c 21 0 chown root.wheel pf chmod 600 pf ;; diff --git a/etc/etc.mac68k/MAKEDEV b/etc/etc.mac68k/MAKEDEV index 0253afa3796..4f0c6625789 100644 --- a/etc/etc.mac68k/MAKEDEV +++ b/etc/etc.mac68k/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.33 2001/06/24 23:36:03 kjell Exp $ +# $OpenBSD: MAKEDEV,v 1.34 2001/06/25 03:20:03 kjell Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -423,7 +423,7 @@ bpf*) pf) rm -f pf - mknod pf c 73 0 + mknod pf c 35 0 chown root.wheel pf chmod 600 pf ;; diff --git a/etc/etc.mvme68k/MAKEDEV b/etc/etc.mvme68k/MAKEDEV index 8a76412ed4e..cfa854c695a 100644 --- a/etc/etc.mvme68k/MAKEDEV +++ b/etc/etc.mvme68k/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.31 2001/06/24 23:36:05 kjell Exp $ +# $OpenBSD: MAKEDEV,v 1.32 2001/06/25 03:20:07 kjell Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $OpenBSD: MAKEDEV,v 1.31 2001/06/24 23:36:05 kjell Exp $ +# $OpenBSD: MAKEDEV,v 1.32 2001/06/25 03:20:07 kjell Exp $ # # Device "make" file. Valid arguments: # all makes all known devices, including local devices, @@ -400,7 +400,7 @@ bpf*) pf) rm -f pf - mknod pf c 73 0 + mknod pf c 39 0 chown root.wheel pf chmod 600 pf ;; diff --git a/etc/etc.mvme88k/MAKEDEV b/etc/etc.mvme88k/MAKEDEV index 5e3c4b3f700..31f6216eea9 100644 --- a/etc/etc.mvme88k/MAKEDEV +++ b/etc/etc.mvme88k/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.12 2001/06/24 23:36:06 kjell Exp $ +# $OpenBSD: MAKEDEV,v 1.13 2001/06/25 03:20:11 kjell Exp $ # $NetBSD: MAKEDEV,v 1.5 1997/01/01 23:46:23 pk Exp $ # # Copyright (c) 1990 The Regents of the University of California. @@ -289,7 +289,7 @@ lpt*|lpa*) pf) rm -f pf - mknod pf c 73 0 + mknod pf c 39 0 chown root.wheel pf chmod 600 pf ;; diff --git a/etc/etc.sparc/MAKEDEV b/etc/etc.sparc/MAKEDEV index f228a3b69ea..d387b4dea84 100644 --- a/etc/etc.sparc/MAKEDEV +++ b/etc/etc.sparc/MAKEDEV @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: MAKEDEV,v 1.67 2001/06/24 23:36:09 kjell Exp $ +# $OpenBSD: MAKEDEV,v 1.68 2001/06/25 03:20:17 kjell Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -337,7 +337,7 @@ bpf*) pf) rm -f pf - mknod pf c 73 0 + mknod pf c 59 0 chown root.wheel pf chmod 600 pf ;; diff --git a/etc/etc.sun3/MAKEDEV b/etc/etc.sun3/MAKEDEV index 17c4a2822c8..5a53039ab09 100644 --- a/etc/etc.sun3/MAKEDEV +++ b/etc/etc.sun3/MAKEDEV @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: MAKEDEV,v 1.35 2001/06/24 23:36:10 kjell Exp $ +# $OpenBSD: MAKEDEV,v 1.36 2001/06/25 03:20:20 kjell Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -273,7 +273,7 @@ bpf*) pf) rm -f pf - mknod pf c 73 0 + mknod pf c 75 0 chown root.wheel pf chmod 600 pf ;; diff --git a/etc/etc.vax/MAKEDEV b/etc/etc.vax/MAKEDEV index ce3f5972748..f368228203d 100644 --- a/etc/etc.vax/MAKEDEV +++ b/etc/etc.vax/MAKEDEV @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: MAKEDEV,v 1.29 2001/06/24 23:36:11 kjell Exp $ +# $OpenBSD: MAKEDEV,v 1.30 2001/06/25 03:20:24 kjell Exp $ # $NetBSD: MAKEDEV,v 1.30 2000/01/21 12:28:29 tsutsui Exp $ # # @(#)MAKEDEV 8.1 (Berkeley) 6/9/93 @@ -593,7 +593,7 @@ qd*) pf) rm -f pf - mknod pf c 73 0 + mknod pf c 42 0 chown root.wheel pf chmod 600 pf ;; diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index 01f95dd329a..59eea187626 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.24 2001/06/24 21:19:08 art Exp $ */ +/* $OpenBSD: conf.c,v 1.25 2001/06/25 03:19:39 kjell Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -178,7 +178,7 @@ struct cdevsw cdevsw[] = cdev_scanner_init(NSS,ss), /* 32: SCSI scanner */ cdev_uk_init(NUK,uk), /* 33: SCSI unknown */ cdev_random_init(1,random), /* 34: random data source */ - cdev_gen_ipf(NIPF,ipl), /* 35: IP filter log */ + cdev_pf_init(NPF, pf), /* 35: packet filter */ cdev_disk_init(NWD,wd), /* 36: ST506/ESDI/IDE disk */ cdev_notdef(), /* 37 */ cdev_tty_init(NCY,cy), /* 38: Cyclom serial port */ @@ -199,7 +199,6 @@ struct cdevsw cdevsw[] = #else cdev_notdef(), /* 51 */ #endif - cdev_pf_init(NPF, pf), /* 52: packet filter */ }; int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]); diff --git a/sys/arch/amiga/amiga/conf.c b/sys/arch/amiga/amiga/conf.c index bd0dcabfd68..23d62375ebd 100644 --- a/sys/arch/amiga/amiga/conf.c +++ b/sys/arch/amiga/amiga/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.29 2000/10/12 19:36:51 espie Exp $ */ +/* $OpenBSD: conf.c,v 1.30 2001/06/25 03:19:44 kjell Exp $ */ /* $NetBSD: conf.c,v 1.42 1997/01/07 11:35:03 mrg Exp $ */ /*- @@ -116,6 +116,8 @@ cdev_decl(audio); (dev_type_stop((*)))enodev, 0, seltrue, \ (dev_type_mmap((*)))enodev } +#include "pf.h" +cdev_decl(pf); struct cdevsw cdevsw[] = { @@ -153,7 +155,7 @@ struct cdevsw cdevsw[] = cdev_tty_init(NMSC,msc), /* 31: A2232 MSC Multiport serial */ cdev_tty_init(NCOM,com), /* 32: ISA serial port */ cdev_lpt_init(NLPT,lpt), /* 33: ISA parallel printer */ - cdev_gen_ipf(NIPF,ipl), /* 34: IP filter log */ + cdev_pf_init(NPF,pf), /* 34: packet filter */ cdev_random_init(1,random), /* 35: random data source */ cdev_uk_init(NUK,uk), /* 36: unknown SCSI */ cdev_disk_init(NWD,wd), /* 37: ST506/ESDI/IDE disk */ diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c index badf7b4a31b..c169e175601 100644 --- a/sys/arch/hp300/hp300/conf.c +++ b/sys/arch/hp300/hp300/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.23 2000/09/26 14:03:52 art Exp $ */ +/* $OpenBSD: conf.c,v 1.24 2001/06/25 03:19:50 kjell Exp $ */ /* $NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $ */ /*- @@ -152,11 +152,8 @@ cdev_decl(ksyms); cdev_decl(xfs_dev); #endif -#ifdef IPFILTER -#define NIPF 1 -#else -#define NIPF 0 -#endif +#include "pf.h" +cdev_decl(pf); struct cdevsw cdevsw[] = { @@ -193,7 +190,7 @@ struct cdevsw cdevsw[] = cdev_lkm_dummy(), /* 30 */ cdev_lkm_dummy(), /* 31 */ cdev_random_init(1,random), /* 32: random generator */ - cdev_gen_ipf(NIPF,ipl), /* 33: ip filtering */ + cdev_pf_init(NPF,pf), /* 33: packet filter */ cdev_disk_init(NRD,rd), /* 34: RAM disk */ cdev_tty_init(NAPCI,apci), /* 35: Apollo APCI UARTs */ cdev_ksyms_init(NKSYMS,ksyms), /* 36: Kernel symbols device */ @@ -214,6 +211,7 @@ struct cdevsw cdevsw[] = #ifdef XFS cdev_xfs_init(NXFS,xfs_dev), /* 51: xfs communication device */ #else + cdev_notdef(), /* 51 */ #endif }; diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c index 0e872723d46..6faf8351ad9 100644 --- a/sys/arch/hppa/hppa/conf.c +++ b/sys/arch/hppa/hppa/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.9 2001/04/01 06:25:33 mickey Exp $ */ +/* $OpenBSD: conf.c,v 1.10 2001/06/25 03:19:55 kjell Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -114,11 +114,8 @@ cdev_decl(lpt); #include "com.h" cdev_decl(com); -#ifdef IPFILTER -#define NIPF 1 -#else -#define NIPF 0 -#endif +#include "pf.h" +cdev_decl(pf); struct cdevsw cdevsw[] = { @@ -143,7 +140,7 @@ struct cdevsw cdevsw[] = cdev_bpftun_init(NTUN,tun), /* 18: network tunnel */ cdev_lkm_init(NLKM,lkm), /* 19: loadable module driver */ cdev_random_init(1,random), /* 20: random generator */ - cdev_gen_ipf(NIPF,ipl), /* 21: ip filtering */ + cdev_pf_init(NPF,pf), /* 21: packet filter */ cdev_tty_init(1,pdc), /* 22: PDC device */ cdev_tty_init(NCOM,com), /* 23: RS232 */ cdev_disk_init(NFD,fd), /* 24: floppy drive */ diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 21d13c44813..3c76c36bebe 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.73 2001/06/24 19:48:57 kjell Exp $ */ +/* $OpenBSD: conf.c,v 1.74 2001/06/25 03:19:59 kjell Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -213,12 +213,6 @@ cdev_decl(ucom); #include "cz.h" cdev_decl(cztty); -#ifdef IPFILTER -#define NIPF 1 -#else -#define NIPF 0 -#endif - /* XXX -- this needs to be supported by config(8)! */ #if (NCOM > 0) && (NPCCOM > 0) #error com and pccom are mutually exclusive. Sorry. @@ -301,7 +295,7 @@ struct cdevsw cdevsw[] = #else cdev_notdef(), /* 43 */ #endif - cdev_gen_ipf(NIPF,ipl), /* 44: ip filtering */ + cdev_notdef(), /* 44 */ cdev_random_init(1,random), /* 45: random data source */ cdev_ocis_init(NPCTR,pctr), /* 46: pentium performance counters */ cdev_disk_init(NRD,rd), /* 47: ram disk driver */ diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c index b644f5ab9d6..4e925058e23 100644 --- a/sys/arch/mac68k/mac68k/conf.c +++ b/sys/arch/mac68k/mac68k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.22 2000/09/26 14:03:53 art Exp $ */ +/* $OpenBSD: conf.c,v 1.23 2001/06/25 03:20:01 kjell Exp $ */ /* $NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $ */ /* @@ -119,11 +119,8 @@ cdev_decl(ksyms); cdev_decl(xfs_dev); #endif -#ifdef IPFILTER -#define NIPF 1 -#else -#define NIPF 0 -#endif +#include "pf.h" +cdev_decl(pf); struct cdevsw cdevsw[] = { @@ -162,7 +159,7 @@ struct cdevsw cdevsw[] = cdev_random_init(1,random), /* 32: random data source */ cdev_ss_init(NSS,ss), /* 33: SCSI scanner */ cdev_uk_init(NUK,uk), /* 34: SCSI unknown */ - cdev_gen_ipf(NIPF,ipl), /* 35: IP filter log */ + cdev_pf_init(NPF,pf), /* 35: packet filter */ cdev_audio_init(NASC,asc), /* 36: ASC audio device */ cdev_ksyms_init(NKSYMS,ksyms), /* 37: Kernel symbols device */ cdev_notdef(), /* 38 */ diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c index f9f1acb364e..4fa997e699c 100644 --- a/sys/arch/mvme68k/mvme68k/conf.c +++ b/sys/arch/mvme68k/mvme68k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.20 2000/09/26 14:03:53 art Exp $ */ +/* $OpenBSD: conf.c,v 1.21 2001/06/25 03:20:05 kjell Exp $ */ /*- * Copyright (c) 1995 Theo de Raadt @@ -178,11 +178,8 @@ dev_decl(filedesc,open); #include "tun.h" -#ifdef IPFILTER -#define NIPF 1 -#else -#define NIPF 0 -#endif +#include "pf.h" +cdev_decl(pf); struct cdevsw cdevsw[] = { @@ -225,7 +222,7 @@ struct cdevsw cdevsw[] = cdev_lkm_dummy(), /* 36 */ cdev_lkm_dummy(), /* 37 */ cdev_lkm_dummy(), /* 38 */ - cdev_gen_ipf(NIPF,ipl), /* 39: IP filter */ + cdev_pf_init(NPF,pf), /* 39: packet filter */ cdev_random_init(1,random), /* 40: random data source */ cdev_uk_init(NUK,uk), /* 41: unknown SCSI */ cdev_ss_init(NSS,ss), /* 42: SCSI scanner */ diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c index 70d07c88dda..60bd325e78f 100644 --- a/sys/arch/mvme88k/mvme88k/conf.c +++ b/sys/arch/mvme88k/mvme88k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.15 2001/03/12 22:57:30 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.16 2001/06/25 03:20:09 kjell Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -195,11 +195,9 @@ cdev_decl(ksyms); #define NLKM 0 #endif -#ifdef IPFILTER -#define NIPF 1 -#else -#define NIPF 0 -#endif + +#include "pf.h" +cdev_decl(pf); cdev_decl(lkm); @@ -258,7 +256,7 @@ struct cdevsw cdevsw[] = cdev_lkm_dummy(), /* 36 */ cdev_lkm_dummy(), /* 37 */ cdev_lkm_dummy(), /* 38 */ - cdev_gen_ipf(NIPF,ipl), /* 39: IP filter */ + cdev_pf_init(NPF,pf), /* 39: packet filter */ cdev_random_init(1,random), /* 40: random data source */ cdev_notdef(), /* 41 */ cdev_notdef(), /* 42 */ diff --git a/sys/arch/powerpc/powerpc/conf.c b/sys/arch/powerpc/powerpc/conf.c index bf20a219bf3..61a000fc51d 100644 --- a/sys/arch/powerpc/powerpc/conf.c +++ b/sys/arch/powerpc/powerpc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.21 2001/06/23 03:30:38 matthieu Exp $ */ +/* $OpenBSD: conf.c,v 1.22 2001/06/25 03:20:13 kjell Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -160,11 +160,6 @@ cdev_decl(xfs_dev); cdev_decl(lkm); -#ifdef IPFILTER -#define NIPF 1 -#else -#define NIPF 0 -#endif #include "ksyms.h" cdev_decl(ksyms); #include "usb.h" @@ -191,6 +186,8 @@ cdev_decl(pci); #include "audio.h" cdev_decl(audio); +#include "pf.h" +cdev_decl(pf); struct cdevsw cdevsw[] = { cdev_cn_init(1,cn), /* 0: virtual console */ @@ -232,7 +229,7 @@ struct cdevsw cdevsw[] = { cdev_lkm_dummy(), /* 36 */ cdev_lkm_dummy(), /* 37 */ cdev_lkm_dummy(), /* 38 */ - cdev_gen_ipf(NIPF,ipl), /* 39: IP filter */ + cdev_pf_init(NPF,pf), /* 39: packet filter */ cdev_random_init(1,random), /* 40: random data source */ cdev_uk_init(NUK,uk), /* 41: unknown SCSI */ cdev_ss_init(NSS,ss), /* 42: SCSI scanner */ diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c index 94abe75b0d0..82e12f32947 100644 --- a/sys/arch/sparc/sparc/conf.c +++ b/sys/arch/sparc/sparc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.26 2000/09/26 14:03:55 art Exp $ */ +/* $OpenBSD: conf.c,v 1.27 2001/06/25 03:20:15 kjell Exp $ */ /* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */ /* @@ -128,6 +128,9 @@ struct bdevsw bdevsw[] = }; int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); +#include "pf.h" +cdev_decl(pf); + struct cdevsw cdevsw[] = { cdev_cn_init(1,cn), /* 0: virtual console */ @@ -197,7 +200,7 @@ struct cdevsw cdevsw[] = cdev_notdef(), /* 56 */ cdev_notdef(), /* 57 */ cdev_disk_init(NCD,cd), /* 58: SCSI CD-ROM */ - cdev_gen_ipf(NIPF,ipl), /* 59: ip filtering log */ + cdev_pf_init(NPF,pf), /* 59: packet filter */ cdev_notdef(), /* 60 */ cdev_notdef(), /* 61 */ cdev_notdef(), /* 62 */ diff --git a/sys/arch/sun3/sun3/conf.c b/sys/arch/sun3/sun3/conf.c index 032f654fff1..f2ff57b01b7 100644 --- a/sys/arch/sun3/sun3/conf.c +++ b/sys/arch/sun3/sun3/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.27 2000/09/26 14:03:55 art Exp $ */ +/* $OpenBSD: conf.c,v 1.28 2001/06/25 03:20:19 kjell Exp $ */ /* $NetBSD: conf.c,v 1.51 1996/11/04 16:16:09 gwr Exp $ */ /*- @@ -111,6 +111,9 @@ struct bdevsw bdevsw[] = }; int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); +#include "pf.h" +cdev_decl(pf); + struct cdevsw cdevsw[] = { cdev_cn_init(1,cn), /* 0: virtual console */ @@ -192,7 +195,7 @@ struct cdevsw cdevsw[] = cdev_random_init(1,random), /* 72: randomness source */ cdev_uk_init(NUK,uk), /* 73: unknown SCSI */ cdev_ss_init(NSS,ss), /* 74: SCSI scanner */ - cdev_gen_ipf(NIPF,ipl), /* 75: ip filter log */ + cdev_pf_init(NPF,pf), /* 75: packet filter */ cdev_lkm_init(NLKM,lkm), /* 76: loadable module driver */ cdev_lkm_dummy(), /* 77 */ cdev_lkm_dummy(), /* 78 */ diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c index 97a7f93d243..0b24f275617 100644 --- a/sys/arch/vax/vax/conf.c +++ b/sys/arch/vax/vax/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.26 2001/05/16 22:15:18 hugh Exp $ */ +/* $OpenBSD: conf.c,v 1.27 2001/06/25 03:20:22 kjell Exp $ */ /* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */ /*- @@ -123,12 +123,6 @@ bdev_decl(cd); #include "ksyms.h" cdev_decl(ksyms); -#ifdef IPFILTER -#define NIPF 1 -#else -#define NIPF 0 -#endif - struct bdevsw bdevsw[] = { bdev_disk_init(NHP,hp), /* 0: RP0?/RM0? */ @@ -441,6 +435,9 @@ dev_decl(filedesc,open); #include "wskbd.h" #include "wsmouse.h" +#include "pf.h" +cdev_decl(pf); + struct cdevsw cdevsw[] = { cdev_cn_init(1,cn), /* 0: virtual console */ @@ -485,7 +482,7 @@ struct cdevsw cdevsw[] = cdev_audio_init(NNP,np), /* 39: NP Intelligent Board */ cdev_graph_init(NQV,qv), /* 40: QVSS graphic display */ cdev_graph_init(NQD,qd), /* 41: QDSS graphic display */ - cdev_gen_ipf(NIPF,ipl), /* 42: Packet filter */ + cdev_pf_init(NPF,pf), /* 42: packet filter */ cdev_ingres_init(NII,ii), /* 43: Ingres device */ cdev_notdef(), /* 44 was Datakit */ cdev_notdef(), /* 45 was Datakit */ |