diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-06-25 22:57:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-25 14:07:29 -0700 |
| commit | 0530bd4a6cc3c04d1e621299e05d2da2c99736c4 (patch) | |
| tree | e332d9e3531dbfdb9c219c91f12271370342b7b6 | |
| parent | 24e095cdc2d7781e756b052291ef0ca7c9edac93 (diff) | |
| download | linux-3.10-0530bd4a6cc3c04d1e621299e05d2da2c99736c4.tar.gz linux-3.10-0530bd4a6cc3c04d1e621299e05d2da2c99736c4.tar.bz2 linux-3.10-0530bd4a6cc3c04d1e621299e05d2da2c99736c4.zip | |
rt2x00: rt2800lib: fix default TX power check for RT55xx
commit 0847beb2865f5ef1c8626ec1a37def18f3d6c41a upstream.
The code writes the default_power2 value into the TX field
of the RFCSR50 register, however the condition in the if
statement uses default_power1. Due to this, wrong TX power
value might be written into the register.
Use the correct value in the condition to fix the issue.
Compile tested only.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 519914f33b4..705aa3386ee 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c @@ -2392,7 +2392,7 @@ static void rt2800_config_channel_rf55xx(struct rt2x00_dev *rt2x00dev, rt2800_rfcsr_write(rt2x00dev, 49, rfcsr); rt2800_rfcsr_read(rt2x00dev, 50, &rfcsr); - if (info->default_power1 > power_bound) + if (info->default_power2 > power_bound) rt2x00_set_field8(&rfcsr, RFCSR50_TX, power_bound); else rt2x00_set_field8(&rfcsr, RFCSR50_TX, info->default_power2); |