Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 772353d8 authored by John W. Linville's avatar John W. Linville Committed by David S. Miller
Browse files

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: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0e5ce1f3

drivers/net/wireless/rtl8187_rtl8225.c

+4 −4
Original line number Diff line number Diff line
@@ -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;