[Midnightbsd-cvs] src: GENERIC: Enable WEP, WPA in kernel.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Enable WEP, WPA in kernel.  Enable firmware(9).  
Adjust whitespace to keep SMP and apic together.

Modified Files:
--------------
    src/sys/i386/conf:
        GENERIC (r1.11 -> r1.12)

-------------- next part --------------
Index: GENERIC
===================================================================
RCS file: /home/cvs/src/sys/i386/conf/GENERIC,v
retrieving revision 1.11
retrieving revision 1.12
diff -L sys/i386/conf/GENERIC -L sys/i386/conf/GENERIC -u -r1.11 -r1.12
--- sys/i386/conf/GENERIC
+++ sys/i386/conf/GENERIC
@@ -46,7 +46,7 @@
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	GEOM_GPT		# GUID Partition Tables.
-options	GEOM_LABEL		# Support for labels with ISO, UFS
+options 	GEOM_LABEL		# Support for labels with ISO, UFS
 options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
@@ -57,14 +57,9 @@
 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.
 options		SMP			# Support Multicore and Multiproccesor
 					# systems.
-
 device		apic			# I/O APIC
 
 # CPU frequency control
@@ -89,7 +84,11 @@
 # SCSI Controllers
 device		ahb		# EISA AHA1742 family
 device		ahc		# AHA2940 and onboard AIC7xxx devices
+#options	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
+					# output.  Adds ~128k to driver.
 device		ahd		# AHA39320/29320 and onboard AIC79xx devices
+#options	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
+					# output.  Adds ~215k to driver.
 device		amd		# AMD 53C974 (Tekram DC-390(T))
 device		isp		# Qlogic family
 #device 	ispfw		# Firmware for QLogic HBAs- normally a module
@@ -230,6 +229,9 @@
 
 # Wireless NIC cards
 device		wlan		# 802.11 support
+device		wlan_wep	# 802.11 WEP support
+device		wlan_ccmp	# 802.11 CCMP support
+device		wlan_tkip	# 802.11 TKIP support
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
 device		awi		# BayStack 660 and others
 device		ral		# Ralink Technology RT2500 wireless NICs.
@@ -247,6 +249,7 @@
 device		md		# Memory "disks"
 device		gif		# IPv6 and IPv4 tunneling
 device		faith		# IPv6-to-IPv4 relaying (translation)
+device		firmware	# firmware assist module
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!