ath5k: Preserve tx power level requested from above on phy_init

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=493ca5ef4ec8a7e8396d6ab26f48de66bdf73dca
Commit:     493ca5ef4ec8a7e8396d6ab26f48de66bdf73dca
Parent:     755051993bfcdf07acd84a7ffd08d463b85bfd69
Author:     Nick Kossifidis <mickflemm at gmail.com>
AuthorDate: Sun Aug 5 22:35:35 2012 +0300
Committer:  John W. Linville <linville at tuxdriver.com>
CommitDate: Fri Aug 10 15:26:56 2012 -0400

    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 at gmail.com>
    Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 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 84a9aaf..27ca993 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;