rpms/kernel/F-10 config-generic, 1.220, 1.221 kernel.spec, 1.1296, 1.1297

[John W. Linville]

Author: linville

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

Modified Files:
	config-generic kernel.spec 
Log Message:
choose minstrel as default mac80211 rate control algorithm (#491212) ; update mac80211 Kconfig options


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- config-generic	19 Mar 2009 18:43:01 -0000	1.220
+++ config-generic	20 Mar 2009 15:19:22 -0000	1.221
@@ -1317,12 +1317,10 @@
 # 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_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


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1296
retrieving revision 1.1297
diff -u -r1.1296 -r1.1297
--- kernel.spec	19 Mar 2009 18:54:16 -0000	1.1296
+++ kernel.spec	20 Mar 2009 15:19:23 -0000	1.1297
@@ -1773,6 +1773,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Mar 20 2009 John W. Linville <linville at redhat.com> 2.6.29-0.67.rc8.git4
+- choose minstrel as default mac80211 rate control algorithm (#491212)
+- update mac80211 Kconfig options
+
 * Thu Mar 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.66.rc8.git4
 - Raise default vm dirty data limits from 5/10 to 10/20 percent.