diff options
author | Sujith Manoharan <c_manoha@qualcomm.com> | 2012-09-09 23:50:12 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-09-11 15:31:39 -0400 |
commit | e41db61d55fa58de9854c1d4932ea255f448d4b8 (patch) | |
tree | 0422fd28cef3ba1c50c1b87ddea89ec8ffceacf4 /drivers/net/wireless/ath/ath9k | |
parent | a4a2954ff49e72ce3fa1f78a156b2492a023c89d (diff) |
ath9k: Set correct max streams for AR9565
Also, set the correct chainmask.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 6539d2acb5e8..063d724bba12 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -2407,7 +2407,10 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) | |||
2407 | if (eeval & AR5416_OPFLAGS_11G) | 2407 | if (eeval & AR5416_OPFLAGS_11G) |
2408 | pCap->hw_caps |= ATH9K_HW_CAP_2GHZ; | 2408 | pCap->hw_caps |= ATH9K_HW_CAP_2GHZ; |
2409 | 2409 | ||
2410 | if (AR_SREV_9485(ah) || AR_SREV_9285(ah) || AR_SREV_9330(ah)) | 2410 | if (AR_SREV_9485(ah) || |
2411 | AR_SREV_9285(ah) || | ||
2412 | AR_SREV_9330(ah) || | ||
2413 | AR_SREV_9565(ah)) | ||
2411 | chip_chainmask = 1; | 2414 | chip_chainmask = 1; |
2412 | else if (AR_SREV_9462(ah)) | 2415 | else if (AR_SREV_9462(ah)) |
2413 | chip_chainmask = 3; | 2416 | chip_chainmask = 3; |
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index f33712140fa5..f3ce5ca2f1d3 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c | |||
@@ -258,7 +258,7 @@ static void setup_ht_cap(struct ath_softc *sc, | |||
258 | ht_info->ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K; | 258 | ht_info->ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K; |
259 | ht_info->ampdu_density = IEEE80211_HT_MPDU_DENSITY_8; | 259 | ht_info->ampdu_density = IEEE80211_HT_MPDU_DENSITY_8; |
260 | 260 | ||
261 | if (AR_SREV_9330(ah) || AR_SREV_9485(ah)) | 261 | if (AR_SREV_9330(ah) || AR_SREV_9485(ah) || AR_SREV_9565(ah)) |
262 | max_streams = 1; | 262 | max_streams = 1; |
263 | else if (AR_SREV_9462(ah)) | 263 | else if (AR_SREV_9462(ah)) |
264 | max_streams = 2; | 264 | max_streams = 2; |