--- GENERIC	Sat Apr  2 16:37:58 2005
+++ P2PLAB	Mon Apr 25 13:57:00 2005
@@ -12,31 +12,33 @@
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
 # device lines is also present in the ../../conf/NOTES and NOTES files.
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
 # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.413.2.13 2005/04/02 16:37:58 scottl Exp $
 
 machine		i386
-cpu		I486_CPU
-cpu		I586_CPU
+#cpu		I486_CPU
+#cpu		I586_CPU
 cpu		I686_CPU
-ident		GENERIC
+ident		P2PLAB
 
 # To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		# Default places to look for devices.
 
 options 	SCHED_4BSD		# 4BSD scheduler
+#options 	SCHED_ULE		# 4BSD scheduler
+options		SMP
 options 	INET			# InterNETworking
-options 	INET6			# IPv6 communications protocols
+#options 	INET6			# IPv6 communications protocols
 options 	FFS			# Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
 options 	UFS_ACL			# Support for access control lists
 options 	UFS_DIRHASH		# Improve performance on big directories
 options 	MD_ROOT			# MD is a potential root device
 options 	NFSCLIENT		# Network Filesystem Client
 options 	NFSSERVER		# Network Filesystem Server
 options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
 options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
@@ -51,20 +53,26 @@
 options 	SYSVMSG			# SYSV-style message queues
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
 					# output.  Adds ~128k to driver.
 options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
 					# output.  Adds ~215k to driver.
 options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
 
+# firewall & dummynet
+options		IPFIREWALL
+options		IPFIREWALL_DEFAULT_TO_ACCEPT	#allow everything by default
+options		DUMMYNET
+options		HZ=10000
+
 device		apic			# I/O APIC
 
 # Bus support.  Do not remove isa, even if you have no isa slots
 device		isa
 device		eisa
 device		pci
 
 # Floppy drives
 device		fdc
 
@@ -155,20 +163,21 @@
 device		pmtimer
 
 # PCCARD (PCMCIA) support
 # PCMCIA and cardbus bridge support
 device		cbb		# cardbus (yenta) bridge
 device		pccard		# PC Card (16-bit) bus
 device		cardbus		# CardBus (32-bit) bus
 
 # Serial (COM) ports
 device		sio		# 8250, 16[45]50 based serial ports
+options CONSPEED=38400
 
 # Parallel port
 device		ppc
 device		ppbus		# Parallel port bus (required)
 device		lpt		# Printer
 device		plip		# TCP/IP over parallel
 device		ppi		# Parallel port interface device
 #device		vpo		# Requires scbus and da
 
 # If you've got a "dumb" serial or parallel PCI card that is