--- elwix/config/ELWIX_ALFA_N2	2014/01/24 01:28:55	1.1.2.14
+++ elwix/config/ELWIX_ALFA_N2	2014/02/05 02:22:14	1.1.2.20
@@ -9,9 +9,10 @@ machine		mips mips
 ident		ELWIX_ALFA_N2
 # XXX The default load address in the Uboot environment is 0x80010000
 makeoptions	KERNLOADADDR=0x80050000
-options		HZ=1000
-#options		HWPMC_HOOKS
-#device			hwpmc
+options		HZ=100
+options		HWPMC_HOOKS
+device		hwpmc
+device		hwpmc_mips24k
 
 # The PB92 has 32mb of RAM; hard-code that
 options		AR71XX_REALMEM=32*1024*1024
@@ -34,7 +35,9 @@ makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug 
 #options		DDB
 #options		KDB
 
-options		SCHED_4BSD		#4BSD scheduler
+options 	PREEMPTION		# Enable kernel thread preemption
+options 	SCHED_ULE		# ULE scheduler
+#options		SCHED_4BSD		#4BSD scheduler
 options		INET			#InterNETworking
 options		INET6
 options		PSEUDOFS		#Pseudo-filesystem framework
@@ -47,7 +50,13 @@ options		ALQ
 #options		INVARIANT_SUPPORT
 #options		WITNESS
 #options		WITNESS_SKIPSPIN
+
+# Don't include the SCSI/CAM strings in the default build
+options 	SCSI_NO_SENSE_STRINGS
+options 	SCSI_NO_OP_STRINGS
+
 options         FFS                     #Berkeley Fast Filesystem
+options 	NO_FFS_SNAPSHOT
 #options         SOFTUPDATES             #Enable FFS soft updates support
 #options         UFS_ACL                 #Support for access control lists
 #options         UFS_DIRHASH             #Improve performance on big directories
@@ -82,7 +91,7 @@ options 	GEOM_UZIP
 device		geom_uzip		# compressed in-memory filesystem support
 
 # Wireless NIC cards
-options		IEEE80211_DEBUG
+#options		IEEE80211_DEBUG
 options		IEEE80211_SUPPORT_MESH
 options		IEEE80211_SUPPORT_SUPERG
 options		IEEE80211_AMPDU_AGE
@@ -101,7 +110,7 @@ device		wlan_rssadapt
 device		ath             # Atheros interface support
 device		ath_pci		# Atheros PCI/Cardbus bus
 device		ath_ahb
-options 	ATH_DEBUG
+#options 	ATH_DEBUG
 options		ATH_ENABLE_11N
 options		ATH_DIAGAPI
 
@@ -117,20 +126,20 @@ options		AH_AR5416_INTERRUPT_MITIGATION
 # There's no DFS radar detection support yet so this won't actually
 # detect radars.  It however does enable the rest of the channel change
 # machinery so DFS can be debugged.
-#option		ATH_ENABLE_DFS
+option		ATH_ENABLE_DFS
 
 device		mii
 device		arge
-#options 	ARGE_DEBUG	# Enable if_arge debugging for now
+##options 	ARGE_DEBUG	# Enable if_arge debugging for now
 options 	ARGE_MDIO		# Export an MDIO bus separate from arge
 device		miiproxy		# MDIO bus <-> MII PHY rendezvous
 
 # USB devices - PB92 has EHCI only
 
 #device		usb
-#options		USB_EHCI_BIG_ENDIAN_DESC        # handle big-endian byte order
-##options		USB_DEBUG
-#options		USB_HOST_ALIGN=32
+options		USB_EHCI_BIG_ENDIAN_DESC        # handle big-endian byte order
+#options		USB_DEBUG
+options		USB_HOST_ALIGN=32
 #device		ehci
 
 # Mass storage
@@ -175,9 +184,18 @@ device		random
 device		if_bridge
 device		gif		# ip[46] in ip[46] tunneling protocol
 device		gre		# generic encapsulation - only for IPv4 in IPv4 though atm
+device		tun
+device		tap
 
-options		MSGBUF_SIZE=65536
-options		SHMALL=128
-options		NSFBUFS=1024
-options		MAXFILES=512
-options		MAXUSERS=3
+device		pf
+device		pflog
+device		pfsync
+
+options 	P1003_1B_MQUEUE
+options 	P1003_1B_SEMAPHORES	# POSIX-style semaphores
+
+#options		MSGBUF_SIZE=65536
+#options		SHMALL=128
+#options		NSFBUFS=1024
+#options		MAXFILES=512
+#options		MAXUSERS=3