Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f84f234c authored by Bill Jordan's avatar Bill Jordan Committed by John W. Linville
Browse files

ath9k: ath9k_hw_set_txpowerlimit sets previous txpower 



In commit 9c204b46
(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: default avatarBill Jordan <bjordan@rajant.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cf577fc2

drivers/net/wireless/ath/ath9k/hw.c

+2 −2
Original line number Diff line number Diff line
@@ -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),