aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-07-27 15:01:02 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-15 18:31:33 -0700
commitcbd1db4bb30ca684d811f4b5bf5dc099aa582445 (patch)
tree24f6b034cc5ac5cec4e9145b3d9fe8aa20afad60 /drivers/net/wireless/ath
parent965045249af402d12228f659cb12a8aead05bbe2 (diff)
downloadkernel_samsung_aries-cbd1db4bb30ca684d811f4b5bf5dc099aa582445.zip
kernel_samsung_aries-cbd1db4bb30ca684d811f4b5bf5dc099aa582445.tar.gz
kernel_samsung_aries-cbd1db4bb30ca684d811f4b5bf5dc099aa582445.tar.bz2
ath9k: initialize tx chainmask before testing channel tx power values
commit c1227340ca65c2069222a956a68b6842d460c4f4 upstream. With an uninitialized chainmask, the per-channel power will only contain the power limits for a single chain instead of the combined tx power. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r--drivers/net/wireless/ath/ath9k/init.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 45c585a..5a9fd21 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -665,8 +665,10 @@ static void ath9k_init_band_txpower(struct ath_softc *sc, int band)
static void ath9k_init_txpower_limits(struct ath_softc *sc)
{
struct ath_hw *ah = sc->sc_ah;
+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
struct ath9k_channel *curchan = ah->curchan;
+ ah->txchainmask = common->tx_chainmask;
if (ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ)
ath9k_init_band_txpower(sc, IEEE80211_BAND_2GHZ);
if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ)