Skip to content

Commit

Permalink
ath9k: ath9k_hw_set_txpowerlimit sets previous txpower
Browse files Browse the repository at this point in the history
In commit 9c204b4
(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>
  • Loading branch information
Bill Jordan authored and John W. Linville committed Sep 13, 2011
1 parent cf577fc commit f84f234
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/ath/ath9k/hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down

0 comments on commit f84f234

Please sign in to comment.