From 97c67a9baea862351ef7014fde676f4a5e19a357 Mon Sep 17 00:00:00 2001
From: atatat <atatat@NetBSD.org>
Date: Sat, 1 Sep 2001 21:52:23 +0000
Subject: [PATCH] Add bridge pseudo devices to GENERIC configs

---
 sys/arch/alpha/conf/GENERIC        | 5 +++--
 sys/arch/amiga/conf/GENERIC        | 5 +++--
 sys/arch/arc/conf/GENERIC          | 5 +++--
 sys/arch/arm26/conf/GENERIC        | 3 ++-
 sys/arch/arm32/conf/GENERIC        | 5 +++--
 sys/arch/atari/conf/GENERIC.in     | 3 ++-
 sys/arch/bebox/conf/GENERIC        | 5 +++--
 sys/arch/cats/conf/GENERIC         | 3 ++-
 sys/arch/cesfic/conf/GENERIC       | 3 ++-
 sys/arch/cobalt/conf/GENERIC       | 5 +++--
 sys/arch/dnard/conf/GENERIC        | 5 +++--
 sys/arch/dreamcast/conf/GENERIC    | 3 ++-
 sys/arch/hp300/conf/GENERIC        | 5 +++--
 sys/arch/hpcmips/conf/GENERIC      | 7 +++++--
 sys/arch/hpcsh/conf/GENERIC        | 3 ++-
 sys/arch/i386/conf/GENERIC         | 7 ++++---
 sys/arch/i386/conf/GENERIC_LAPTOP  | 5 +++--
 sys/arch/i386/conf/GENERIC_PS2TINY | 3 ++-
 sys/arch/i386/conf/GENERIC_TINY    | 3 ++-
 sys/arch/luna68k/conf/GENERIC      | 5 +++--
 sys/arch/mac68k/conf/GENERIC       | 5 +++--
 sys/arch/mac68k/conf/GENERICSBC    | 5 +++--
 sys/arch/macppc/conf/GENERIC       | 5 +++--
 sys/arch/mipsco/conf/GENERIC       | 3 ++-
 sys/arch/mmeye/conf/GENERIC        | 5 +++--
 sys/arch/mvme68k/conf/GENERIC      | 5 +++--
 sys/arch/netwinder/conf/GENERIC    | 3 ++-
 sys/arch/news68k/conf/GENERIC      | 5 +++--
 sys/arch/news68k/conf/GENERIC_TINY | 5 +++--
 sys/arch/newsmips/conf/GENERIC     | 5 +++--
 sys/arch/next68k/conf/GENERIC      | 5 +++--
 sys/arch/ofppc/conf/GENERIC        | 5 +++--
 sys/arch/pc532/conf/GENERIC        | 5 +++--
 sys/arch/pmax/conf/GENERIC         | 5 +++--
 sys/arch/prep/conf/GENERIC         | 5 +++--
 sys/arch/sandpoint/conf/GENERIC    | 5 +++--
 sys/arch/sparc/conf/GENERIC        | 7 +++++--
 sys/arch/sparc64/conf/GENERIC32    | 7 +++++--
 sys/arch/sun2/conf/GENERIC         | 5 +++--
 sys/arch/sun3/conf/GENERIC         | 5 +++--
 sys/arch/sun3/conf/GENERIC3X       | 3 ++-
 sys/arch/vax/conf/GENERIC          | 5 +++--
 sys/arch/x68k/conf/GENERIC         | 7 +++++--
 43 files changed, 127 insertions(+), 76 deletions(-)

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 94f73601a887..1b1afed869cc 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.191 2001/08/22 15:39:04 hubertf Exp $
+# $NetBSD: GENERIC,v 1.192 2001/09/01 21:52:23 atatat Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
 #
@@ -6,7 +6,7 @@
 
 include	"arch/alpha/conf/std.alpha"
 
-#ident 		"GENERIC-$Revision: 1.191 $"
+#ident 		"GENERIC-$Revision: 1.192 $"
 
 maxusers 32
 
@@ -474,6 +474,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	rnd			# /dev/random and in-kernel generator
 #options 	RND_COM			# use "com" randomness too
diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC
index e2320efbb73b..bfda22085988 100644
--- a/sys/arch/amiga/conf/GENERIC
+++ b/sys/arch/amiga/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.161 2001/08/25 21:15:46 is Exp $
+#	$NetBSD: GENERIC,v 1.162 2001/09/01 21:52:24 atatat Exp $
 
 #
 #if 0
@@ -16,7 +16,7 @@
 
 include "arch/amiga/conf/std.amiga"
 
-#ident 		"GENERIC-$Revision: 1.161 $"
+#ident 		"GENERIC-$Revision: 1.162 $"
 
 #ifdef INSTALL_CONFIGURATION
 makeoptions	COPTS="-Os"
@@ -473,6 +473,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 
 pseudo-device	view		4	# views (needed for grfcc)
 pseudo-device	pty			# pseudo-terminals
diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index 91b6108caada..da06df81ba37 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.48 2001/08/22 15:39:05 hubertf Exp $
+#	$NetBSD: GENERIC,v 1.49 2001/09/01 21:52:24 atatat Exp $
 #	$OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -6,7 +6,7 @@
 
 include		"arch/arc/conf/std.arc"
 
-#ident		"GENERIC-$Revision: 1.48 $"
+#ident		"GENERIC-$Revision: 1.49 $"
 
 maxusers	32		# estimated number of users
 
@@ -357,6 +357,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
diff --git a/sys/arch/arm26/conf/GENERIC b/sys/arch/arm26/conf/GENERIC
index a575d8a1f082..2bc756c66915 100644
--- a/sys/arch/arm26/conf/GENERIC
+++ b/sys/arch/arm26/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.24 2001/07/08 16:32:14 abs Exp $
+# $NetBSD: GENERIC,v 1.25 2001/09/01 21:52:24 atatat Exp $
 
 # GENERIC arm26 configuration -- everything I've implemented so far
 
@@ -192,6 +192,7 @@ pseudo-device	gre		2	# generic L3 over IP tunnel
 pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	wsmux		2	# keyboard/mouse multiplexor
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/arm32/conf/GENERIC b/sys/arch/arm32/conf/GENERIC
index 291194ac02e4..93b07f1d4d14 100644
--- a/sys/arch/arm32/conf/GENERIC
+++ b/sys/arch/arm32/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.84 2001/07/10 20:43:58 bjh21 Exp $
+#	$NetBSD: GENERIC,v 1.85 2001/09/01 21:52:25 atatat Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
 
 include	"arch/arm32/conf/std.arm32"
 
-#ident 		"GENERIC-$Revision: 1.84 $"
+#ident 		"GENERIC-$Revision: 1.85 $"
 
 # estimated number of users
 maxusers	32
@@ -285,6 +285,7 @@ pseudo-device	gif	4		# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	stf	1		# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	strip	4		# STarmode Radio IP (Metricon Ricochet)
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	pty			# pseudo-terminals
 pseudo-device	tb	1		# tablet line discipline
 pseudo-device	vnd     4               # disk-like interface to files
diff --git a/sys/arch/atari/conf/GENERIC.in b/sys/arch/atari/conf/GENERIC.in
index 9382afecd8aa..47b3cfa55ed9 100644
--- a/sys/arch/atari/conf/GENERIC.in
+++ b/sys/arch/atari/conf/GENERIC.in
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.in,v 1.6 2001/07/09 13:37:38 leo Exp $
+#	$NetBSD: GENERIC.in,v 1.7 2001/09/01 21:52:25 atatat Exp $
 #
 # Generic atari
 #
@@ -215,6 +215,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	ccd		4	# concatenating disk driver
 #pseudo-device	raid		4	# RAIDframe disk driver
 #options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
diff --git a/sys/arch/bebox/conf/GENERIC b/sys/arch/bebox/conf/GENERIC
index 921e7ccc278d..210bd18a4635 100644
--- a/sys/arch/bebox/conf/GENERIC
+++ b/sys/arch/bebox/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.41 2001/08/26 02:47:35 matt Exp $
+#	$NetBSD: GENERIC,v 1.42 2001/09/01 21:52:25 atatat Exp $
 #
 # First try for BEBOX config file
 #
 
 include "arch/bebox/conf/std.bebox"
 
-#ident 		"GENERIC-$Revision: 1.41 $"
+#ident 		"GENERIC-$Revision: 1.42 $"
 
 maxusers	32
 
@@ -71,6 +71,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	pty			# pseudo-terminals
 #pseudo-device	raid		4	# RAIDframe disk driver
 #options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index eb0e711649a0..bb951db9d347 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.8 2001/07/08 16:32:16 abs Exp $
+#	$NetBSD: GENERIC,v 1.9 2001/09/01 21:52:25 atatat Exp $
 #
 #	CATS -- CHALTECH CATS Development kernel
 #
@@ -475,6 +475,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
diff --git a/sys/arch/cesfic/conf/GENERIC b/sys/arch/cesfic/conf/GENERIC
index 52843621170a..fd25812b604b 100644
--- a/sys/arch/cesfic/conf/GENERIC
+++ b/sys/arch/cesfic/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.4 2001/08/25 18:37:20 chs Exp $
+#	$NetBSD: GENERIC,v 1.5 2001/09/01 21:52:25 atatat Exp $
 #
 # Generic kernel - one size fits all.
 #
@@ -85,6 +85,7 @@ pseudo-device	pty		64	# pseudo ptys
 #pseudo-device	sl		4	# SLIP network interfaces
 #pseudo-device	ppp		4	# PPP network interfaces
 #pseudo-device	bpfilter	16	# Berkeley packet filter
+#pseudo-device	bridge			# simple inter-network bridging
 #pseudo-device	vnd		4	# vnode pseudo-disks
 #pseudo-device	ccd		4	# concatenated disk devices
 pseudo-device	loop			# loopback network interface
diff --git a/sys/arch/cobalt/conf/GENERIC b/sys/arch/cobalt/conf/GENERIC
index 279e755c6f57..a6931eb44879 100644
--- a/sys/arch/cobalt/conf/GENERIC
+++ b/sys/arch/cobalt/conf/GENERIC
@@ -1,8 +1,8 @@
-#	$NetBSD: GENERIC,v 1.18 2001/08/22 15:39:05 hubertf Exp $
+#	$NetBSD: GENERIC,v 1.19 2001/09/01 21:52:26 atatat Exp $
 
 include 	"arch/cobalt/conf/std.cobalt"
 
-#ident 		"GENERIC-$Revision: 1.18 $"
+#ident 		"GENERIC-$Revision: 1.19 $"
 
 maxusers	32
 
@@ -237,6 +237,7 @@ pseudo-device	loop				# network loopback
 #pseudo-device	faith		1		# IPv[46] tcp relay translation 
 #pseudo-device	stf		1		# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 
 # Miscellaneous pseudo-devices
 pseudo-device	pty				# pseudo-terminals
diff --git a/sys/arch/dnard/conf/GENERIC b/sys/arch/dnard/conf/GENERIC
index b54328163f3a..8f6e3c60d003 100644
--- a/sys/arch/dnard/conf/GENERIC
+++ b/sys/arch/dnard/conf/GENERIC
@@ -1,8 +1,8 @@
-#	$NetBSD: GENERIC,v 1.3 2001/07/08 16:32:16 abs Exp $
+#	$NetBSD: GENERIC,v 1.4 2001/09/01 21:52:26 atatat Exp $
 
 include	"arch/dnard/conf/std.dnard"
 
-#ident		"GENERIC-$Revision: 1.3 $"
+#ident		"GENERIC-$Revision: 1.4 $"
 
 # estimated number of users
 maxusers	32
@@ -203,6 +203,7 @@ joy*		at ofisa?
 
 pseudo-device	loop	1		# network loopback
 pseudo-device	bpfilter 8		# packet filter
+#pseudo-device	bridge			# simple inter-network bridging
 #pseudo-device	sl	2		# CSLIP
 #pseudo-device	ppp	2		# PPP
 #pseudo-device	tun	2		# network tunneling over tty
diff --git a/sys/arch/dreamcast/conf/GENERIC b/sys/arch/dreamcast/conf/GENERIC
index eee6c9f70f03..b9f2352064b9 100644
--- a/sys/arch/dreamcast/conf/GENERIC
+++ b/sys/arch/dreamcast/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.11 2001/06/30 11:00:33 darcy Exp $
+#	$NetBSD: GENERIC,v 1.12 2001/09/01 21:52:26 atatat Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -149,6 +149,7 @@ ukphy*		at mii? phy ?
 
 #pseudo-device	vnd		4	# disk-like interface to files
 #pseudo-device	bpfilter	8	# Berkeley packet filter
+#pseudo-device	bridge			# simple inter-network bridging
 #pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
 pseudo-device	pty			# pseudo-terminals
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index 5ac1828627e3..bef3e7ba3b83 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.66 2001/07/08 16:32:17 abs Exp $
+#	$NetBSD: GENERIC,v 1.67 2001/09/01 21:52:26 atatat Exp $
 #
 # Generic kernel - one size fits all.
 #
@@ -6,7 +6,7 @@
 # Include attributes common to all hp300s
 include "arch/hp300/conf/std.hp300"
 
-#ident 		"GENERIC-$Revision: 1.66 $"
+#ident 		"GENERIC-$Revision: 1.67 $"
 
 # Support for various CPU types
 options 	HP320
@@ -196,4 +196,5 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/hpcmips/conf/GENERIC b/sys/arch/hpcmips/conf/GENERIC
index 1f64ababb3f9..e1de35f7bd9a 100644
--- a/sys/arch/hpcmips/conf/GENERIC
+++ b/sys/arch/hpcmips/conf/GENERIC
@@ -2,11 +2,11 @@
 # Distribution kernel (NEC VR based model) kernel config file
 
 #
-# 	$NetBSD: GENERIC,v 1.92 2001/06/11 05:17:45 enami Exp $
+# 	$NetBSD: GENERIC,v 1.93 2001/09/01 21:52:27 atatat Exp $
 #
 include		"arch/hpcmips/conf/std.hpcmips"
 
-#ident 		"GENERIC-$Revision: 1.92 $"
+#ident 		"GENERIC-$Revision: 1.93 $"
 
 maxusers	10
 
@@ -391,3 +391,6 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 
 ## IEEE 802.1Q Virtual LAN encapsulation, see vlan(4).
 pseudo-device	vlan
+
+## Simple inter-network traffic bridging
+pseudo-device	bridge
diff --git a/sys/arch/hpcsh/conf/GENERIC b/sys/arch/hpcsh/conf/GENERIC
index 844763b2f3a9..7750309947ce 100644
--- a/sys/arch/hpcsh/conf/GENERIC
+++ b/sys/arch/hpcsh/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.6 2001/07/14 17:02:57 kanaoka Exp $
+#	$NetBSD: GENERIC,v 1.7 2001/09/01 21:52:27 atatat Exp $
 #
 #	GENERIC kernel for SH3+HD64461 based machines.
 #
@@ -136,6 +136,7 @@ pseudo-device	biconsdev	1	# build-in console device
 
 # network pseudo-devices
 pseudo-device	bpfilter	8	# Berkeley packet filter
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
 pseudo-device	ppp		2	# Point-to-Point Protocol
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 62e33cfd1061..6c1e997805be 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.419 2001/08/27 22:25:42 augustss Exp $
+#	$NetBSD: GENERIC,v 1.420 2001/09/01 21:52:27 atatat Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
 
 include "arch/i386/conf/std.i386"
 
-#ident 		"GENERIC-$Revision: 1.419 $"
+#ident 		"GENERIC-$Revision: 1.420 $"
 
 maxusers	32		# estimated number of users
 
@@ -249,7 +249,7 @@ pci*	at ppb? bus ?
 pchb*	at pci? dev ? function ?	# PCI-Host bridges
 pceb*	at pci? dev ? function ?	# PCI-EISA bridges
 pcib*	at pci? dev ? function ?	# PCI-ISA bridges
-pcmb*	at pci?	dev ? function ?	# PCI-MCA bridges
+pcmb*	at pci? dev ? function ?	# PCI-MCA bridges
 ppb*	at pci? dev ? function ?	# PCI-PCI bridges
 # XXX 'puc's aren't really bridges, but there's no better place for them here
 puc*	at pci? dev ? function ?	# PCI "universal" comm. cards
@@ -943,6 +943,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
diff --git a/sys/arch/i386/conf/GENERIC_LAPTOP b/sys/arch/i386/conf/GENERIC_LAPTOP
index 106d93015903..24be5da48cf1 100644
--- a/sys/arch/i386/conf/GENERIC_LAPTOP
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_LAPTOP,v 1.19 2001/08/22 15:28:57 hubertf Exp $
+#	$NetBSD: GENERIC_LAPTOP,v 1.20 2001/09/01 21:52:27 atatat Exp $
 #	From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
 #
 #	GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -6,7 +6,7 @@
 
 include "arch/i386/conf/std.i386"
 
-#ident 		"GENERIC-$Revision: 1.19 $"
+#ident 		"GENERIC-$Revision: 1.20 $"
 
 maxusers	32		# estimated number of users
 
@@ -735,6 +735,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
diff --git a/sys/arch/i386/conf/GENERIC_PS2TINY b/sys/arch/i386/conf/GENERIC_PS2TINY
index dfb6e77c1677..3867a3ead66e 100644
--- a/sys/arch/i386/conf/GENERIC_PS2TINY
+++ b/sys/arch/i386/conf/GENERIC_PS2TINY
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_PS2TINY,v 1.2 2001/07/30 21:50:48 jdolecek Exp $
+#	$NetBSD: GENERIC_PS2TINY,v 1.3 2001/09/01 21:52:27 atatat Exp $
 #
 #	GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains
 #	IBM PS/2 related stuff and has been generally trimmed down somewhat,
@@ -209,6 +209,7 @@ cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
 
 # network pseudo-devices
 pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	loop			# network loopback
 
 # miscellaneous pseudo-devices
diff --git a/sys/arch/i386/conf/GENERIC_TINY b/sys/arch/i386/conf/GENERIC_TINY
index 43addb7e4256..cb22f58e436c 100644
--- a/sys/arch/i386/conf/GENERIC_TINY
+++ b/sys/arch/i386/conf/GENERIC_TINY
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_TINY,v 1.27 2001/07/08 16:32:18 abs Exp $
+#	$NetBSD: GENERIC_TINY,v 1.28 2001/09/01 21:52:27 atatat Exp $
 #
 #	GENERIC_TINY -- suitable default for 4M machines
 #			No EISA, PCI, or SCSI.
@@ -549,6 +549,7 @@ pseudo-device	vnd		4	# disk-like interface to files
 
 # network pseudo-devices
 pseudo-device	bpfilter	8	# Berkeley packet filter
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
 pseudo-device	ppp		2	# Point-to-Point Protocol
diff --git a/sys/arch/luna68k/conf/GENERIC b/sys/arch/luna68k/conf/GENERIC
index 0fd7c231b63f..6ee0602f2d9b 100644
--- a/sys/arch/luna68k/conf/GENERIC
+++ b/sys/arch/luna68k/conf/GENERIC
@@ -1,10 +1,10 @@
-#	$NetBSD: GENERIC,v 1.19 2001/07/08 16:32:19 abs Exp $
+#	$NetBSD: GENERIC,v 1.20 2001/09/01 21:52:28 atatat Exp $
 #
 #	GENERIC LUNA68K
 #
 include		"arch/luna68k/conf/std.luna68k"
 
-#ident 		"GENERIC-$Revision: 1.19 $"
+#ident 		"GENERIC-$Revision: 1.20 $"
 
 maxusers	8
 
@@ -137,5 +137,6 @@ pseudo-device	pty			# pseudo-terminals
 #pseudo-device	sl		1	# SLIP interfaces
 #pseudo-device	tun		2	# Network "tunnel" device
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 #pseudo-device	vnd		2	# disk-like interface to files
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 10161d370f7b..50bb0f592dfe 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,10 +1,10 @@
-#	$NetBSD: GENERIC,v 1.111 2001/07/08 16:32:19 abs Exp $
+#	$NetBSD: GENERIC,v 1.112 2001/09/01 21:52:28 atatat Exp $
 #
 # GENERIC
 
 include	"arch/mac68k/conf/std.mac68k"
 
-#ident 		"GENERIC-$Revision: 1.111 $"
+#ident 		"GENERIC-$Revision: 1.112 $"
 
 maxusers	16		# estimated number of users
 
@@ -256,6 +256,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	grf		2	# grf emulation for wscons
diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC
index 49e0162fb2dd..1b38ecb99558 100644
--- a/sys/arch/mac68k/conf/GENERICSBC
+++ b/sys/arch/mac68k/conf/GENERICSBC
@@ -1,10 +1,10 @@
-#	$NetBSD: GENERICSBC,v 1.2 2001/07/08 16:32:19 abs Exp $
+#	$NetBSD: GENERICSBC,v 1.3 2001/09/01 21:52:28 atatat Exp $
 #
 # GENERIC
 
 include	"arch/mac68k/conf/std.mac68k"
 
-#ident 		"GENERIC-$Revision: 1.2 $"
+#ident 		"GENERIC-$Revision: 1.3 $"
 
 maxusers	16		# estimated number of users
 
@@ -241,6 +241,7 @@ pseudo-device	vnd		4	# disk-like interface to files
 
 # network pseudo-devices
 pseudo-device	bpfilter	12	# Berkeley packet filter
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop			# network loopback
 pseudo-device	ppp		2	# Point-to-Point Protocol
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 1a776a97435c..4caef33cc09a 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.107 2001/08/29 17:37:48 briggs Exp $
+#	$NetBSD: GENERIC,v 1.108 2001/09/01 21:52:28 atatat Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
 
 include		"arch/macppc/conf/std.macppc"
 
-#ident 		"GENERIC-$Revision: 1.107 $"
+#ident 		"GENERIC-$Revision: 1.108 $"
 
 maxusers	32
 
@@ -335,6 +335,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	pty			# pseudo-terminals
 pseudo-device	rnd			# /dev/random and in-kernel generator
 pseudo-device	openfirm		# /dev/openfirm
diff --git a/sys/arch/mipsco/conf/GENERIC b/sys/arch/mipsco/conf/GENERIC
index ffec5d484200..4942f4f8d73a 100644
--- a/sys/arch/mipsco/conf/GENERIC
+++ b/sys/arch/mipsco/conf/GENERIC
@@ -1,5 +1,5 @@
 #
-# 	$NetBSD: GENERIC,v 1.7 2001/07/08 16:32:20 abs Exp $
+# 	$NetBSD: GENERIC,v 1.8 2001/09/01 21:52:28 atatat Exp $
 #
 include		"arch/mipsco/conf/std.mipsco"
 
@@ -126,6 +126,7 @@ pseudo-device	bpfilter	16	# Berkeley Packet Filter
 #pseudo-device	strip		1	# radio clock
 #pseudo-device	ipfilter		# ip filter
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 
 # random number generator pseudo-device
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/mmeye/conf/GENERIC b/sys/arch/mmeye/conf/GENERIC
index 03c922a1bce0..3c6f63375798 100644
--- a/sys/arch/mmeye/conf/GENERIC
+++ b/sys/arch/mmeye/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.24 2001/07/08 16:32:20 abs Exp $
+#	$NetBSD: GENERIC,v 1.25 2001/09/01 21:52:29 atatat Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
 
 include "arch/mmeye/conf/std.mmeye"
 
-#ident 		"GENERIC-$Revision: 1.24 $"
+#ident 		"GENERIC-$Revision: 1.25 $"
 
 maxusers	16		# estimated number of users
 
@@ -163,6 +163,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	pty			# pseudo-terminals
 pseudo-device	rnd			# /dev/random and in-kernel generator
 pseudo-device	vcoda		4	# coda minicache <-> venus comm.
diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC
index d92ad431e3da..4d8f1a495e5f 100644
--- a/sys/arch/mvme68k/conf/GENERIC
+++ b/sys/arch/mvme68k/conf/GENERIC
@@ -1,8 +1,8 @@
-#	$NetBSD: GENERIC,v 1.27 2001/07/27 18:40:27 scw Exp $
+#	$NetBSD: GENERIC,v 1.28 2001/09/01 21:52:29 atatat Exp $
 
 include		"arch/mvme68k/conf/std.mvme68k"
 
-#ident 		"GENERIC-$Revision: 1.27 $"
+#ident 		"GENERIC-$Revision: 1.28 $"
 
 # Boards this kernel supports
 options 	MVME147
@@ -76,6 +76,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	pty			# pseudo-terminals
 pseudo-device	vnd 2
 
diff --git a/sys/arch/netwinder/conf/GENERIC b/sys/arch/netwinder/conf/GENERIC
index b8b42731d58b..ac01a28ebedc 100644
--- a/sys/arch/netwinder/conf/GENERIC
+++ b/sys/arch/netwinder/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.6 2001/08/20 16:17:12 matt Exp $
+#	$NetBSD: GENERIC,v 1.7 2001/09/01 21:52:29 atatat Exp $
 #
 #	GENERIC -- Netwinder Architecture Kernel
 #
@@ -224,6 +224,7 @@ pseudo-device	vnd		4	# disk-like interface to files
 
 # network pseudo-devices
 pseudo-device	bpfilter	4	# Berkeley packet filter
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	loop			# network loopback
 
 # miscellaneous pseudo-devices
diff --git a/sys/arch/news68k/conf/GENERIC b/sys/arch/news68k/conf/GENERIC
index b37e0f6c6dc6..0018c5c91814 100644
--- a/sys/arch/news68k/conf/GENERIC
+++ b/sys/arch/news68k/conf/GENERIC
@@ -1,10 +1,10 @@
-# 	$NetBSD: GENERIC,v 1.21 2001/07/08 16:32:21 abs Exp $
+# 	$NetBSD: GENERIC,v 1.22 2001/09/01 21:52:29 atatat Exp $
 
 #	news68k GENERIC config file;
 #
 include		"arch/news68k/conf/std.news68k"
 
-#ident 		"GENERIC-$Revision: 1.21 $"
+#ident 		"GENERIC-$Revision: 1.22 $"
 
 maxusers	8
 
@@ -189,5 +189,6 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	rnd			# /dev/random and in-kernle generator
 #pseudo-device	vcoda		4	# coda minicache <-> venus comm.
diff --git a/sys/arch/news68k/conf/GENERIC_TINY b/sys/arch/news68k/conf/GENERIC_TINY
index f19cdb410636..d7544598b212 100644
--- a/sys/arch/news68k/conf/GENERIC_TINY
+++ b/sys/arch/news68k/conf/GENERIC_TINY
@@ -1,10 +1,10 @@
-# 	$NetBSD: GENERIC_TINY,v 1.3 2001/07/08 16:32:21 abs Exp $
+# 	$NetBSD: GENERIC_TINY,v 1.4 2001/09/01 21:52:29 atatat Exp $
 
 #	news68k GENERIC config file for low memory machines;
 #
 include		"arch/news68k/conf/std.news68k"
 
-#ident 		"GENERIC_TINY-$Revision: 1.3 $"
+#ident 		"GENERIC_TINY-$Revision: 1.4 $"
 
 maxusers	4
 
@@ -185,5 +185,6 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	rnd			# /dev/random and in-kernle generator
 #pseudo-device	vcoda		4	# coda minicache <-> venus comm.
diff --git a/sys/arch/newsmips/conf/GENERIC b/sys/arch/newsmips/conf/GENERIC
index e5a7b323b730..e58c2407819a 100644
--- a/sys/arch/newsmips/conf/GENERIC
+++ b/sys/arch/newsmips/conf/GENERIC
@@ -1,10 +1,10 @@
-# 	$NetBSD: GENERIC,v 1.36 2001/07/08 16:32:21 abs Exp $
+# 	$NetBSD: GENERIC,v 1.37 2001/09/01 21:52:29 atatat Exp $
 #
 #	GENERIC kernel for RISC-NEWS
 
 include		"arch/newsmips/conf/std.newsmips"
 
-#ident 		"GENERIC-$Revision: 1.36 $"
+#ident 		"GENERIC-$Revision: 1.37 $"
 
 maxusers	16
 
@@ -160,6 +160,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	vnd		4	# disk-like interface to files
 pseudo-device	ccd		4	# concatenated and striped disks
 #pseudo-device	raid		4	# RAIDframe disk driver
diff --git a/sys/arch/next68k/conf/GENERIC b/sys/arch/next68k/conf/GENERIC
index 7576508c7bac..92b873f7507a 100644
--- a/sys/arch/next68k/conf/GENERIC
+++ b/sys/arch/next68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.43 2001/07/08 16:32:22 abs Exp $
+# $NetBSD: GENERIC,v 1.44 2001/09/01 21:52:30 atatat Exp $
 #
 # GENERIC next68k
 #
@@ -6,7 +6,7 @@
 
 include "arch/next68k/conf/std.next68k"
 
-#ident 		"GENERIC-$Revision: 1.43 $"
+#ident 		"GENERIC-$Revision: 1.44 $"
 
 # Needs to be set per system.  i.e change these as you see fit
 maxusers	16
@@ -194,6 +194,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	rnd			# /dev/random and in-kernel generator
 #pseudo-device	wsmux		2	# mouse & keyboard multiplexor
 
diff --git a/sys/arch/ofppc/conf/GENERIC b/sys/arch/ofppc/conf/GENERIC
index 9fcb6e0cbeff..50973b2a37af 100644
--- a/sys/arch/ofppc/conf/GENERIC
+++ b/sys/arch/ofppc/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.40 2001/08/26 02:47:39 matt Exp $
+#	$NetBSD: GENERIC,v 1.41 2001/09/01 21:52:30 atatat Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
 
 include "arch/ofppc/conf/std.ofppc"
 
-#ident 		"GENERIC-$Revision: 1.40 $"
+#ident 		"GENERIC-$Revision: 1.41 $"
 
 maxusers	32
 
@@ -144,5 +144,6 @@ pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith			# IPv[46] tcp relay translation i/f
 #pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	pty			# pseudo-terminals
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/pc532/conf/GENERIC b/sys/arch/pc532/conf/GENERIC
index 168783bcb452..e295caee344c 100644
--- a/sys/arch/pc532/conf/GENERIC
+++ b/sys/arch/pc532/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.18 2001/07/08 16:32:22 abs Exp $
+#	$NetBSD: GENERIC,v 1.19 2001/09/01 21:52:30 atatat Exp $
 #
 # GENERIC: generic kernel for most machines
 #
 
 include	"arch/pc532/conf/std.pc532"
 
-#ident 		"GENERIC-$Revision: 1.18 $"
+#ident 		"GENERIC-$Revision: 1.19 $"
 
 maxusers	8			# estimated number of users
 
@@ -80,5 +80,6 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	ccd 4			# Concatenated Disk Driver
 pseudo-device   rnd                     # kernel random number generator
diff --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC
index 76438e257224..a75e6ae925ca 100644
--- a/sys/arch/pmax/conf/GENERIC
+++ b/sys/arch/pmax/conf/GENERIC
@@ -1,11 +1,11 @@
 #
-# 	$NetBSD: GENERIC,v 1.89 2001/08/26 11:47:20 simonb Exp $
+# 	$NetBSD: GENERIC,v 1.90 2001/09/01 21:52:31 atatat Exp $
 #
 # Distribution kernel (any model) kernel config file
 #
 include		"arch/pmax/conf/std.pmax"
 
-#ident		"GENERIC-$Revision: 1.89 $"
+#ident		"GENERIC-$Revision: 1.90 $"
 
 maxusers	64
 
@@ -202,6 +202,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 
 pseudo-device	vnd		 4	# virtual disk ick
 pseudo-device	ccd		 4	# concatenated disks
diff --git a/sys/arch/prep/conf/GENERIC b/sys/arch/prep/conf/GENERIC
index bb404447cc70..94775202c85a 100644
--- a/sys/arch/prep/conf/GENERIC
+++ b/sys/arch/prep/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.26 2001/08/29 17:37:47 briggs Exp $
+#	$NetBSD: GENERIC,v 1.27 2001/09/01 21:52:31 atatat Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
 
 include "arch/prep/conf/std.prep"
 
-#ident		"GENERIC-$Revision: 1.26 $"
+#ident		"GENERIC-$Revision: 1.27 $"
 
 maxusers	32
 
@@ -420,6 +420,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		2	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		2	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
diff --git a/sys/arch/sandpoint/conf/GENERIC b/sys/arch/sandpoint/conf/GENERIC
index 7a99de7b6530..3941d21567ef 100644
--- a/sys/arch/sandpoint/conf/GENERIC
+++ b/sys/arch/sandpoint/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.11 2001/08/30 02:08:42 briggs Exp $
+#	$NetBSD: GENERIC,v 1.12 2001/09/01 21:52:31 atatat Exp $
 #
 # GENERIC for Motorola Sandpoint
 #
 
 include "arch/sandpoint/conf/std.sandpoint"
 
-#ident 		"GENERIC-$Revision: 1.11 $"
+#ident 		"GENERIC-$Revision: 1.12 $"
 
 maxusers	32
 
@@ -63,6 +63,7 @@ config		netbsd	root on ? type ?
 
 # network psuedo-devices
 pseudo-device	bpfilter	8	# packet filter
+pseudo-device	bridge			# simple inter-network bridging
 #pseudo-device	ipfilter
 pseudo-device	loop
 
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 57faf794a779..17c2ee4e6874 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,8 +1,8 @@
-# 	$NetBSD: GENERIC,v 1.121 2001/06/30 11:00:36 darcy Exp $
+# 	$NetBSD: GENERIC,v 1.122 2001/09/01 21:52:31 atatat Exp $
 
 include "arch/sparc/conf/std.sparc"
 
-#ident 		"GENERIC-$Revision: 1.121 $"
+#ident 		"GENERIC-$Revision: 1.122 $"
 
 maxusers	32
 
@@ -507,6 +507,9 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 ## IEEE 802.1Q Virtual LAN encapsulation, see vlan(4).
 pseudo-device	vlan
 
+## Simple inter-network traffic bridging
+pseudo-device	bridge
+
 #### Audio and video devices
 
 ## /dev/audio support (`audioamd' plus `audio')
diff --git a/sys/arch/sparc64/conf/GENERIC32 b/sys/arch/sparc64/conf/GENERIC32
index 049b4e84af61..c36fbf5bbd7f 100644
--- a/sys/arch/sparc64/conf/GENERIC32
+++ b/sys/arch/sparc64/conf/GENERIC32
@@ -1,8 +1,8 @@
-# 	$NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $
+# 	$NetBSD: GENERIC32,v 1.19 2001/09/01 21:52:32 atatat Exp $
 
 include "arch/sparc64/conf/std.sparc64"
 
-#ident 		"GENERIC-$Revision: 1.18 $"
+#ident 		"GENERIC-$Revision: 1.19 $"
 
 maxusers	64
 
@@ -470,6 +470,9 @@ pseudo-device	tun		4
 ## interface that allows selective examining of incoming packets.
 pseudo-device	bpfilter	8
 
+## Simple inter-network traffic bridging
+pseudo-device	bridge
+
 ## IP Filter, used in firewall and NAT applications.  See ipnat(8) for
 ## one example of the use of the IP Filter.
 pseudo-device	ipfilter
diff --git a/sys/arch/sun2/conf/GENERIC b/sys/arch/sun2/conf/GENERIC
index 76140ee0ae88..6d672c868e1d 100644
--- a/sys/arch/sun2/conf/GENERIC
+++ b/sys/arch/sun2/conf/GENERIC
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.6 2001/07/08 16:32:25 abs Exp $
+# $NetBSD: GENERIC,v 1.7 2001/09/01 21:52:32 atatat Exp $
 
 # GENERIC Sun2 (2/120, 2/170, 2/50, ...)
 # Supports root on: ie0, sd*, ...
 
 include "arch/sun2/conf/std.sun2"
 
-#ident 		"GENERIC-$Revision: 1.6 $"
+#ident 		"GENERIC-$Revision: 1.7 $"
 
 # Machines to be supported by this kernel
 #options 	FPU_EMULATE
@@ -206,6 +206,7 @@ pcons0	at mainbus0			# PROM console
 #### Miscellaneous.
 pseudo-device	loop		1	# network loopback
 #pseudo-device	bpfilter	8	# packet filter
+#pseudo-device	bridge			# simple inter-network bridging
 #pseudo-device	sl		2	# CSLIP
 #pseudo-device	ppp		2	# PPP
 #pseudo-device	tun		2	# network tunneling over tty
diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC
index 8c211dcc7e5b..43a353e4abc0 100644
--- a/sys/arch/sun3/conf/GENERIC
+++ b/sys/arch/sun3/conf/GENERIC
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.80 2001/07/08 16:32:25 abs Exp $
+# $NetBSD: GENERIC,v 1.81 2001/09/01 21:52:32 atatat Exp $
 
 # GENERIC Sun3 (3/50, 3/60, 3/110, 3/160, 3/260, 3/E)
 # Supports root on: ie0, le0, sd*, ...
 
 include "arch/sun3/conf/std.sun3"
 
-#ident 		"GENERIC-$Revision: 1.80 $"
+#ident 		"GENERIC-$Revision: 1.81 $"
 
 # Machines to be supported by this kernel
 options 	FPU_EMULATE
@@ -218,6 +218,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	rnd			# /dev/random and in-kernel generator
 
 pseudo-device	pty			# pseudo-terminals
diff --git a/sys/arch/sun3/conf/GENERIC3X b/sys/arch/sun3/conf/GENERIC3X
index b959b1352ca2..e64140776082 100644
--- a/sys/arch/sun3/conf/GENERIC3X
+++ b/sys/arch/sun3/conf/GENERIC3X
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC3X,v 1.40 2001/07/08 16:32:25 abs Exp $
+# $NetBSD: GENERIC3X,v 1.41 2001/09/01 21:52:32 atatat Exp $
 
 # GENERIC Sun3X (3/80, 3/470)
 # Supports root on: ie0, le0, sd*, ...
@@ -218,6 +218,7 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 #pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	rnd			# /dev/random and in-kernel generator
 
 pseudo-device	pty			# pseudo-terminals
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index 2f253f4476c7..8b56670fdc56 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,11 +1,11 @@
-#	$NetBSD: GENERIC,v 1.89 2001/06/30 11:00:37 darcy Exp $
+#	$NetBSD: GENERIC,v 1.90 2001/09/01 21:52:32 atatat Exp $
 #
 # GENERIC VAX configuration file; all supported devices.
 #
 
 include		"arch/vax/conf/std.vax"
 
-#ident 		"GENERIC-$Revision: 1.89 $"
+#ident 		"GENERIC-$Revision: 1.90 $"
 
 # Here are all different supported CPU types listed.
 #options 	"VAX8800"	# VAX 8500, 8530, 8550, 8700, 8800
@@ -239,6 +239,7 @@ pseudo-device	gif	4		# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith	1		# IPv[46] tcp relay translation i/f
 #pseudo-device	stf	1		# 6to4 IPv6 over IPv4 encapsulation
 pseudo-device	vlan			# IEEE 802.1q encapsulation
+pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	tb	1
 pseudo-device	vnd	4
 pseudo-device	ccd	4
diff --git a/sys/arch/x68k/conf/GENERIC b/sys/arch/x68k/conf/GENERIC
index 67e396971d3d..e6ebd479ee47 100644
--- a/sys/arch/x68k/conf/GENERIC
+++ b/sys/arch/x68k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.60 2001/07/08 16:32:26 abs Exp $
+#	$NetBSD: GENERIC,v 1.61 2001/09/01 21:52:33 atatat Exp $
 
 #
 #	GENERIC
@@ -6,7 +6,7 @@
 
 include "arch/x68k/conf/std.x68k"
 
-#ident 		"GENERIC-$Revision: 1.60 $"
+#ident 		"GENERIC-$Revision: 1.61 $"
 
 maxusers	8
 
@@ -312,6 +312,9 @@ pseudo-device	gif		1	# IPv[46] over IPv[46] tunnel (RFC1933)
 ## IEEE 802.1Q Virtual LAN encapsulation, see vlan(4).
 pseudo-device	vlan
 
+## Simple inter-network traffic bridging
+pseudo-device	bridge
+
 #### Other device configuration
 
 ## Pseudo ttys, required for network logins and programs like screen.