diff options
| author | Nick Kossifidis <mickflemm@gmail.com> | 2012-08-05 21:35:35 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-08-10 21:26:56 +0200 |
| commit | 493ca5ef4ec8a7e8396d6ab26f48de66bdf73dca (patch) | |
| tree | 0fb379fe399b5489c71578dcb45efdb1dc8f18f3 | |
| parent | ath5k: Fix range scaling when setting rate power table (diff) | |
| download | linux-493ca5ef4ec8a7e8396d6ab26f48de66bdf73dca.tar.xz linux-493ca5ef4ec8a7e8396d6ab26f48de66bdf73dca.zip | |
ath5k: Preserve tx power level requested from above on phy_init
By using cur_pwr on phy_init we re-use the power level previously set by the
driver, not the one we got from above.
Signed-off-by: Nick Kossifidis <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/phy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c index 84a9aafd91a2..27ca993586d7 100644 --- a/drivers/net/wireless/ath/ath5k/phy.c +++ b/drivers/net/wireless/ath/ath5k/phy.c @@ -3802,8 +3802,8 @@ ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel, * RF buffer settings on 5211/5212+ so that we * properly set curve indices. */ - ret = ath5k_hw_txpower(ah, channel, ah->ah_txpower.txp_cur_pwr ? - ah->ah_txpower.txp_cur_pwr / 2 : AR5K_TUNE_MAX_TXPOWER); + ret = ath5k_hw_txpower(ah, channel, ah->power_level ? + ah->power_level * 2 : AR5K_TUNE_MAX_TXPOWER); if (ret) return ret; |