aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Merello <andreamrl@tiscali.it>2007-12-02 17:17:51 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:05:46 -0800
commit43fd6c7ebdd50276a7d26d7dddcb109c291dde50 (patch)
tree84b8ba5eec6e4c471cb4f042c7127286b4cc1c6d
parent9ee1ba474fc37bcaf6a958bf7e995006fc69893b (diff)
downloadlinux-linaro-stable-43fd6c7ebdd50276a7d26d7dddcb109c291dde50.tar.gz
rtl8187: fix tx power reading
CCK and OFDM power levels are stored in adjacent bytes, not nibbles. Signed-off-by: Michael Wu <flamingice@sourmilk.net> Signed-off-by: Andrea Merello <andreamrl@tiscali.it> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rtl8187_rtl8225.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/rtl8187_rtl8225.c b/drivers/net/wireless/rtl8187_rtl8225.c
index efc41207780e..eade81f76510 100644
--- a/drivers/net/wireless/rtl8187_rtl8225.c
+++ b/drivers/net/wireless/rtl8187_rtl8225.c
@@ -283,8 +283,8 @@ static void rtl8225_rf_set_tx_power(struct ieee80211_hw *dev, int channel)
u32 reg;
int i;
- cck_power = priv->channels[channel - 1].val & 0xF;
- ofdm_power = priv->channels[channel - 1].val >> 4;
+ cck_power = priv->channels[channel - 1].val & 0xFF;
+ ofdm_power = priv->channels[channel - 1].val >> 8;
cck_power = min(cck_power, (u8)11);
ofdm_power = min(ofdm_power, (u8)35);
@@ -500,8 +500,8 @@ static void rtl8225z2_rf_set_tx_power(struct ieee80211_hw *dev, int channel)
u32 reg;
int i;
- cck_power = priv->channels[channel - 1].val & 0xF;
- ofdm_power = priv->channels[channel - 1].val >> 4;
+ cck_power = priv->channels[channel - 1].val & 0xFF;
+ ofdm_power = priv->channels[channel - 1].val >> 8;
cck_power = min(cck_power, (u8)15);
cck_power += priv->txpwr_base & 0xF;