From: Nick Kossifidis <mickflemm@gmail.com>
To: ath5k-devel@lists.ath5k.org, linux-wireless@vger.kernel.org
Cc: linville@tuxdriver.com, mcgrof@gmail.com, jirislaby@gmail.com,
thomas@net.t-labs.tu-berlin.de, nbd@openwrt.org,
Nick Kossifidis <mickflemm@gmail.com>
Subject: [PATCH v2 3/5] ath5k: Preserve tx power level requested from above on phy_init
Date: Sun, 5 Aug 2012 22:35:35 +0300 [thread overview]
Message-ID: <1344195337-27461-4-git-send-email-mickflemm@gmail.com> (raw)
In-Reply-To: <1344195337-27461-1-git-send-email-mickflemm@gmail.com>
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>
---
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;
--
1.7.3.4
next prev parent reply other threads:[~2012-08-05 19:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-05 19:35 [PATCH v2 0/5] ath5k: Various tx power fixes Nick Kossifidis
2012-08-05 19:35 ` [PATCH v2 1/5] ath5k: Use correct value for min_pwr and cur_pwr Nick Kossifidis
2012-08-05 19:35 ` [PATCH v2 2/5] ath5k: Fix range scaling when setting rate power table Nick Kossifidis
2012-08-05 19:35 ` Nick Kossifidis [this message]
2012-08-05 19:35 ` [PATCH v2 4/5] ath5k: Put power_level where it belongs and rename it Nick Kossifidis
2012-08-05 19:35 ` [PATCH v2 5/5] ath5k: Return correct offset when reading frequencies Nick Kossifidis
2012-08-08 16:55 ` [ath5k-devel] " Thomas Huehn
2012-08-08 17:56 ` Nick Kossifidis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1344195337-27461-4-git-send-email-mickflemm@gmail.com \
--to=mickflemm@gmail.com \
--cc=ath5k-devel@lists.ath5k.org \
--cc=jirislaby@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=mcgrof@gmail.com \
--cc=nbd@openwrt.org \
--cc=thomas@net.t-labs.tu-berlin.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).