[kernel] r10301 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Wed Jan 30 22:17:03 2008
New Revision: 10301

Log:
topconfig explicitly set the new mac80211 rate algo

simple is deprecated and will be removed, thus disabled,
see c21b39aca4f8f4975784e54cd3a1b80bab80dcc0


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Jan 30 22:17:03 2008
@@ -13,7 +13,7 @@
     CRYPTO_SALSA20, CRYPTO_LZO, CRYPTO_DEV_HIFN_795X, USB_SI470X,
     USB_STKWEBCAM, VIDEO_PVRUSB2_ONAIR_USB2, VIDEO_PVRUSB2_ONAIR_CREATOR,
     VIDEO_EM28XX_ALSA, CRYPTO_DEV_HIFN_795X_RNG, PCF8575, TPS65010, RTL8180,
-    ENC28J60, R6040, CAN, NETFILTER_XT_MATCH_OWNER,
+    ENC28J60, R6040, CAN, NETFILTER_XT_MATCH_OWNER, MAC80211_RC_DEFAULT_PI,
     NETFILTER_XT_TARGET_RATEEST, NETFILTER_XT_TARGET_TCPOPTSTRIP,
     NETFILTER_XT_MATCH_IPRANGE, NETFILTER_XT_MATCH_RATEEST.
   * [amd64] Enable CRYPTO_SALSA20_X86_64.

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Wed Jan 30 22:17:03 2008
@@ -533,6 +533,14 @@
 CONFIG_CFG80211=m
 CONFIG_NL80211=y
 CONFIG_MAC80211=m
+
+#
+# Rate control algorithm selection
+#
+CONFIG_MAC80211_RC_DEFAULT_PID=y
+# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set
+# CONFIG_MAC80211_RC_DEFAULT_NONE is not set
+
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
 # CONFIG_MAC80211_DEBUG is not set