diff options
| author | Bill Jordan <bjordan@rajant.com> | 2011-08-31 17:51:00 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-13 15:53:46 -0400 |
| commit | f84f234c6417e3d60b1cfeaf9d16c3bd1c8fe2a5 (patch) | |
| tree | 51b08d72dc1ebd63c7fff023572761333abbb31c /drivers/net/wireless/ath/ath9k | |
| parent | cf577fc242ea5295f676ae3bf9ecb524d78d9e77 (diff) | |
| download | op-kernel-dev-f84f234c6417e3d60b1cfeaf9d16c3bd1c8fe2a5.zip op-kernel-dev-f84f234c6417e3d60b1cfeaf9d16c3bd1c8fe2a5.tar.gz | |
ath9k: ath9k_hw_set_txpowerlimit sets previous txpower
In commit 9c204b46c7af93e334114bea1f5eeaa6fea9ba07
(ath9k_hw: do not limit initial tx power to 20 dbm),
setting of txpower was broken.
This patch fixes it by initializing reg_pwr from the new
power limit, not the previous value.
Signed-off-by: Bill Jordan <bjordan@rajant.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 16884c4..47d10a4 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -2451,13 +2451,13 @@ void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test) struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah); struct ath9k_channel *chan = ah->curchan; struct ieee80211_channel *channel = chan->chan; - int reg_pwr = min_t(int, MAX_RATE_POWER, regulatory->power_limit); + int reg_pwr = min_t(int, MAX_RATE_POWER, limit); int chan_pwr = channel->max_power * 2; if (test) reg_pwr = chan_pwr = MAX_RATE_POWER; - regulatory->power_limit = min(limit, (u32) MAX_RATE_POWER); + regulatory->power_limit = reg_pwr; ah->eep_ops->set_txpower(ah, chan, ath9k_regd_get_ctl(regulatory, chan), |
