diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-07-27 09:01:02 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-01 13:46:44 -0400 |
commit | c1227340ca65c2069222a956a68b6842d460c4f4 (patch) | |
tree | 48f2e5380871d0a78756a00db56a6feb997d5043 /drivers/net/wireless/ath/ath9k/init.c | |
parent | 5bc91db8933bce07c3af86da2bd956414aa5a725 (diff) |
ath9k: initialize tx chainmask before testing channel tx power values
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>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/init.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 2 |
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 dceaa4a82811..2e9634641c46 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c | |||
@@ -669,8 +669,10 @@ static void ath9k_init_band_txpower(struct ath_softc *sc, int band) | |||
669 | static void ath9k_init_txpower_limits(struct ath_softc *sc) | 669 | static void ath9k_init_txpower_limits(struct ath_softc *sc) |
670 | { | 670 | { |
671 | struct ath_hw *ah = sc->sc_ah; | 671 | struct ath_hw *ah = sc->sc_ah; |
672 | struct ath_common *common = ath9k_hw_common(sc->sc_ah); | ||
672 | struct ath9k_channel *curchan = ah->curchan; | 673 | struct ath9k_channel *curchan = ah->curchan; |
673 | 674 | ||
675 | ah->txchainmask = common->tx_chainmask; | ||
674 | if (ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ) | 676 | if (ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ) |
675 | ath9k_init_band_txpower(sc, IEEE80211_BAND_2GHZ); | 677 | ath9k_init_band_txpower(sc, IEEE80211_BAND_2GHZ); |
676 | if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ) | 678 | if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ) |