CHROMIUMOS: compat-wireless: fixup rate control configuration

chromeos/scripts/compat_wireless_config

 # /bin/sh
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
 #
 # Helper script to setup compat-wireless configuration.
 #
 
 S=${1:?No kernel source directory specified}
@@ skipping 18 matching lines @@
         CONFIG_RFKILL_BACKPORT=y
         CONFIG_RFKILL_BACKPORT_INPUT=y
 
         CONFIG_COMPAT_WIRELESS=m
         CONFIG_COMPAT_WIRELESS_MODULES=m
 
         CONFIG_MAC80211=m
         CONFIG_MAC80211_LEDS=y
         CONFIG_MAC80211_DEBUGFS=y
         CONFIG_MAC80211_RC_MINSTREL=y
-        CONFIG_MAC80211_RC_DEFAULT="minstrel"
-        CONFIG_COMPAT_MAC80211_RC_DEFAULT="minstrel"
+        CONFIG_MAC80211_RC_MINSTREL_HT=y
+        CONFIG_COMPAT_MAC80211_RC_DEFAULT="minstrel_ht"
         CONFIG_MAC80211_DEBUG_COUNTERS=y
 
         CONFIG_CFG80211=m
         CONFIG_CFG80211_DEBUGFS=y
         CONFIG_CFG80211_DEFAULT_PS=y
         CONFIG_CFG80211_WEXT=y
 
         CONFIG_ATH=y
         CONFIG_ATH_COMMON=m
         CONFIG_ATH_DEBUG=y
         CONFIG_ATH5K=m
         CONFIG_ATH5K_PCI=y
         CONFIG_ATH9K=m
         CONFIG_ATH9K_HW=m
         CONFIG_ATH9K_COMMON=m
+        CONFIG_ATH9K_RATE_CONTROL=y

[mukesh agrawal, 2011/04/25 17:41:52]

I see that we enable ath9k rate control here. But I'm curious why we do it
differently in this kernel, compared to kernel-next (where the config item is
set in config.common.i386 (and x86_64).
Is the reason for the difference that compat_wireless doesn't pay attention to
that file?

Or, perhaps what I'm really asking is how compat_wireless gets its config
settings. AFAICT, compat_wireless_config has never had CONFIG_ATH9K_RATE_CONTROL
set before. So did I miss a chnage in this file, or was the regression due to a
change in some other file?

[Sam Leffler, 2011/04/25 18:26:41]

We're using compat-wireless to bring in newer wifi support.  That has a separate
config mechanism than kernel-next and different config knobs to avoid conflict
w/ the in-kernel code.  The config mechanism is in the file 
scripts/compat_wireless_config which is run by the kernel ebuild. I haven't
looked at kernel-next to see if it's config setup is correct; we aren't using it
yet for x86 and for arm things are different.

The reason we lost the ath9k rc module was the change to
drivers/net/wireless/ath/ath9k/Makefile that moved rc.o from a standard builtin
component to an optional component.  Here's the relevant snippet of the diff:

git diff c45eaff59eae2b9b8b9921b8ce580daf100b99fa Makefile
diff --git a/chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/Makefile b/
index 973ae4f..aca0162 100644
--- a/chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/Makefile
+++ b/chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/Makefile
@@ -5,8 +5,8 @@ ath9k-y +=      beacon.o \
                recv.o \
                xmit.o \
                virtual.o \
-               rc.o
 
+ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o

[mukesh agrawal, 2011/04/25 20:12:59]

Cool -- makes sense now.

         CONFIG_ATH9K_DEBUGFS=y
 
         CONFIG_IWLWIFI=m
         CONFIG_COMPAT_IWLWIFI=m
         CONFIG_IWLWIFI_SPECTRUM_MANAGEMENT=y
         CONFIG_IWLAGN=m
         CONFIG_COMPAT_IWL4965=y
         CONFIG_IWL5000=y
         CONFIG_IWL3945=m
         CONFIG_IWL3945_SPECTRUM_MANAGEMENT=y
@@ skipping 53 matching lines @@
 #ifdef CONFIG_NET_SCHED
 #ifdef CONFIG_NETDEVICES_MULTIQUEUE
 #ifndef CONFIG_MAC80211_QOS
 #define CONFIG_MAC80211_QOS 1
 #endif /* CONFIG_MAC80211_QOS */ 
 #endif
 #endif
 #endif /* COMPAT_AUTOCONF_INCLUDED */
 EOF
 )>"${COMPAT_WIRELESS}"/include/linux/compat_autoconf.h