From 4b3b4781d0bdc00485376fb86053590ff5ab96ae Mon Sep 17 00:00:00 2001 From: Nick Kossifidis Date: Sun, 5 Aug 2012 22:35:35 +0300 Subject: [PATCH] --- yaml --- r: 327508 b: refs/heads/master c: 493ca5ef4ec8a7e8396d6ab26f48de66bdf73dca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath5k/phy.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 907ea87b73f2..d279d6d9436b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 755051993bfcdf07acd84a7ffd08d463b85bfd69 +refs/heads/master: 493ca5ef4ec8a7e8396d6ab26f48de66bdf73dca diff --git a/trunk/drivers/net/wireless/ath/ath5k/phy.c b/trunk/drivers/net/wireless/ath/ath5k/phy.c index 84a9aafd91a2..27ca993586d7 100644 --- a/trunk/drivers/net/wireless/ath/ath5k/phy.c +++ b/trunk/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;