From 772353d84991ecd2eebc2e287c381cb1626f9209 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Tue, 8 Jan 2008 15:53:51 -0500 Subject: [PATCH] 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 --- drivers/net/wireless/rtl8187_rtl8225.c | 8 ++++---- 1 file 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) u32 reg; int i; - cck_power = priv->channels[channel - 1].val & 0xFF; - ofdm_power = priv->channels[channel - 1].val >> 8; + cck_power = priv->channels[channel - 1].val & 0xF; + ofdm_power = priv->channels[channel - 1].val >> 4; 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 & 0xFF; - ofdm_power = priv->channels[channel - 1].val >> 8; + cck_power = priv->channels[channel - 1].val & 0xF; + ofdm_power = priv->channels[channel - 1].val >> 4; cck_power = min(cck_power, (u8)15); cck_power += priv->txpwr_base & 0xF; -- GitLab