rpms/kernel/F-11 config-generic, 1.281, 1.282 kernel.spec, 1.1637, 1.1638

[John W. Linville]

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26408

Modified Files:
	config-generic kernel.spec 
Log Message:
Clean-up some wireless bits in config-generic


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-generic,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- config-generic	4 May 2009 08:22:26 -0000	1.281
+++ config-generic	9 Jun 2009 15:10:51 -0000	1.282
@@ -1318,36 +1318,29 @@ CONFIG_PCMCIA_NETWAVE=m
 CONFIG_WLAN_80211=y
 # CONFIG_PCMCIA_RAYCS is not set
 
-CONFIG_MAC80211=m
-CONFIG_MAC80211_QOS=y
-CONFIG_MAC80211_RC_DEFAULT_PID=y
-# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set
-CONFIG_MAC80211_RC_DEFAULT="pid"
-CONFIG_MAC80211_RC_PID=y
-CONFIG_MAC80211_RC_SIMPLE=y
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-CONFIG_MAC80211_DEBUGFS=y
-CONFIG_MAC80211_RC_MINSTREL=y
-# CONFIG_MAC80211_DEBUG_MENU is not set
-# CONFIG_MAC80211_DEBUG is not set
-# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set
-# CONFIG_MAC80211_DEBUG is not set
-
-CONFIG_IEEE80211=m
-# CONFIG_IEEE80211_DEBUG is not set
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_WIRELESS=y
 CONFIG_CFG80211=m
 # CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_NL80211=y
-CONFIG_LIB80211=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_WIRELESS=y
 # CONFIG_WIRELESS_OLD_REGULATORY is not set
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+
+CONFIG_MAC80211=m
+CONFIG_MAC80211_QOS=y
+CONFIG_MAC80211_RC_MINSTREL=y
+# CONFIG_MAC80211_RC_DEFAULT_PID is not set
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_DEBUGFS=y
+# CONFIG_MAC80211_DEBUG_MENU is not set
 
 CONFIG_WIMAX=y
 CONFIG_WIMAX_DEBUG_LEVEL=8


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1637
retrieving revision 1.1638
diff -u -p -r1.1637 -r1.1638
--- kernel.spec	9 Jun 2009 07:16:03 -0000	1.1637
+++ kernel.spec	9 Jun 2009 15:10:51 -0000	1.1638
@@ -2020,6 +2020,9 @@ fi
 # and build.
 
 %changelog
+* Tue Jun 09 2009 John W. Linville <linville at tuxdriver.com>
+- Clean-up some wireless bits in config-generic
+
 * Tue Jun  9 2009 Chuck Ebbert <cebbert at redhat.com> - 2.6.29.4-175
 - Add ext4 stable patch queue, 18 patches submitted for 2.6.29.5
   (adds 10 patches that weren't already in F-11.)