diff options
| author | John W. Linville <linville@tuxdriver.com> | 2008-01-08 15:53:51 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:09:11 -0500 |
| commit | 772353d84991ecd2eebc2e287c381cb1626f9209 (patch) | |
| tree | 972f985697373ef3b95b3feb3b888fd447304587 | |
| parent | 0e5ce1f33049a823f508f4a3f53ba186b12396b8 (diff) | |
Revert "rtl8187: fix tx power reading"
This reverts commit e4128a54d790658ab265c915e5da9153ff74af97.
On Sunday 02 December 2007 17:17:51 Michael Wu wrote:
> CCK and OFDM power levels are stored in adjacent bytes, not nibbles.
>
This turns out to be true only for rtl8180. On rtl8187, power levels are
indeed stored in nibbles, so this patch is wrong. Please revert this patch.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/rtl8187_rtl8225.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/rtl8187_rtl8225.c b/drivers/net/wireless/rtl8187_rtl8225.c index eade81f76510..efc41207780e 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) | |||
| 283 | u32 reg; | 283 | u32 reg; |
| 284 | int i; | 284 | int i; |
| 285 | 285 | ||
| 286 | cck_power = priv->channels[channel - 1].val & 0xFF; | 286 | cck_power = priv->channels[channel - 1].val & 0xF; |
| 287 | ofdm_power = priv->channels[channel - 1].val >> 8; | 287 | ofdm_power = priv->channels[channel - 1].val >> 4; |
| 288 | 288 | ||
| 289 | cck_power = min(cck_power, (u8)11); | 289 | cck_power = min(cck_power, (u8)11); |
| 290 | ofdm_power = min(ofdm_power, (u8)35); | 290 | ofdm_power = min(ofdm_power, (u8)35); |
| @@ -500,8 +500,8 @@ static void rtl8225z2_rf_set_tx_power(struct ieee80211_hw *dev, int channel) | |||
| 500 | u32 reg; | 500 | u32 reg; |
| 501 | int i; | 501 | int i; |
| 502 | 502 | ||
| 503 | cck_power = priv->channels[channel - 1].val & 0xFF; | 503 | cck_power = priv->channels[channel - 1].val & 0xF; |
| 504 | ofdm_power = priv->channels[channel - 1].val >> 8; | 504 | ofdm_power = priv->channels[channel - 1].val >> 4; |
| 505 | 505 | ||
| 506 | cck_power = min(cck_power, (u8)15); | 506 | cck_power = min(cck_power, (u8)15); |
| 507 | cck_power += priv->txpwr_base & 0xF; | 507 | cck_power += priv->txpwr_base & 0xF; |