From 82a3e04a954a13e29e47e28c99a33f533f48c02a Mon Sep 17 00:00:00 2001 From: Andrea Merello Date: Sun, 2 Dec 2007 17:17:51 -0500 Subject: [PATCH] --- yaml --- r: 79085 b: refs/heads/master c: 43fd6c7ebdd50276a7d26d7dddcb109c291dde50 h: refs/heads/master i: 79083: 4759f94ce5cf2801ee2436b2f635ef1753446d09 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rtl8187_rtl8225.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 66f0cc065249..cba7f9cfc188 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ee1ba474fc37bcaf6a958bf7e995006fc69893b +refs/heads/master: 43fd6c7ebdd50276a7d26d7dddcb109c291dde50 diff --git a/trunk/drivers/net/wireless/rtl8187_rtl8225.c b/trunk/drivers/net/wireless/rtl8187_rtl8225.c index efc41207780e..eade81f76510 100644 --- a/trunk/drivers/net/wireless/rtl8187_rtl8225.c +++ b/trunk/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;