summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGertjan van Wingerde <gwingerde@gmail.com>2009-11-23 22:44:47 +0100
committerJohn W. Linville <linville@tuxdriver.com>2009-11-28 15:04:33 -0500
commit38a522e6bc0fcd9848b91366ec899f1c2cb23609 (patch)
tree97241468dd9c162bd7c851fa933c4e42df4daee1
parentc7c8adb53ff3e8fa3cf7a5144bd2791c4da2c07d (diff)
downloadlinux-38a522e6bc0fcd9848b91366ec899f1c2cb23609.tar.gz
linux-38a522e6bc0fcd9848b91366ec899f1c2cb23609.tar.bz2
linux-38a522e6bc0fcd9848b91366ec899f1c2cb23609.zip
rt2x00: Only initialize HT on rt2800 devices that support it.
Some RT28xx/RT30xx devices don't support 802.11n, when they are combined with the RF2020 chipset. Ensure that HT is disabled for these devices. Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rt2x00/rt2800lib.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index e94f1e13fea9..fcd0c88d5f04 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -2072,7 +2072,11 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
/*
* Initialize HT information.
*/
- spec->ht.ht_supported = true;
+ if (!rt2x00_rf(chip, RF2020))
+ spec->ht.ht_supported = true;
+ else
+ spec->ht.ht_supported = false;
+
spec->ht.cap =
IEEE80211_HT_CAP_SUP_WIDTH_20_40 |
IEEE80211_HT_CAP_GRN_FLD |