aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath9k
diff options
context:
space:
mode:
authorSujith <Sujith.Manoharan@atheros.com>2009-01-27 10:55:31 +0530
committerJohn W. Linville <linville@tuxdriver.com>2009-01-30 13:38:21 -0500
commit3c4572657656117c1f9cf1df42e681ea71abb2db (patch)
treef37cd546c69f9320ae151a22fb0e449121de07e5 /drivers/net/wireless/ath9k
parentfb9ddbf086591ab4c90c44d10468f84d465b3fdf (diff)
downloadkernel_samsung_smdk4412-3c4572657656117c1f9cf1df42e681ea71abb2db.zip
kernel_samsung_smdk4412-3c4572657656117c1f9cf1df42e681ea71abb2db.tar.gz
kernel_samsung_smdk4412-3c4572657656117c1f9cf1df42e681ea71abb2db.tar.bz2
ath9k: Handle chainmask for A9280
The default chainmask for AR9280 is 3, so handle that when setting the supported MCS rates. Also, check for the HW supported chainmask when choosing single/dual stream. Signed-off-by: Sujith <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k')
-rw-r--r--drivers/net/wireless/ath9k/main.c1
-rw-r--r--drivers/net/wireless/ath9k/rc.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index ede8980..04a6051 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -876,6 +876,7 @@ static void setup_ht_cap(struct ath_softc *sc,
case 1:
ht_info->mcs.rx_mask[0] = 0xff;
break;
+ case 3:
case 5:
case 7:
default:
diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c
index 8e1528d..eb557ad 100644
--- a/drivers/net/wireless/ath9k/rc.c
+++ b/drivers/net/wireless/ath9k/rc.c
@@ -1359,7 +1359,7 @@ static void ath_rc_init(struct ath_softc *sc,
if (sta->ht_cap.ht_supported) {
ath_rc_priv->ht_cap = WLAN_RC_HT_FLAG;
- if (sc->sc_tx_chainmask != 1)
+ if (sc->sc_ah->ah_caps.tx_chainmask != 1)
ath_rc_priv->ht_cap |= WLAN_RC_DS_FLAG;
if (sta->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)
ath_rc_priv->ht_cap |= WLAN_RC_40_FLAG;