diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-01-30 10:17:56 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 14:50:38 -0500 |
commit | 7f4666ab3fd656513bffd449410a4d7c189081ec (patch) | |
tree | 41e9b177eb12b335818c03fa935cf52a6dd9875f | |
parent | 5718b134b1fe09087ca225b0e475ef65536d02b4 (diff) |
rt2800: radio 3xxx: reprogram only lower bits of RF_R3
Synchronize code with Ralink driver:
2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V2.5.0.3_DPO
(functions: RT33xx_ChipSwitchChannel() and RT30xx_ChipSwitchChannel())
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800.h | 5 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h index 2571a2fa3d0..abf2ae58816 100644 --- a/drivers/net/wireless/rt2x00/rt2800.h +++ b/drivers/net/wireless/rt2x00/rt2800.h | |||
@@ -1796,6 +1796,11 @@ struct mac_iveiv_entry { | |||
1796 | #define RFCSR2_RESCAL_EN FIELD8(0x80) | 1796 | #define RFCSR2_RESCAL_EN FIELD8(0x80) |
1797 | 1797 | ||
1798 | /* | 1798 | /* |
1799 | * RFCSR 3: | ||
1800 | */ | ||
1801 | #define RFCSR3_K FIELD8(0x0f) | ||
1802 | |||
1803 | /* | ||
1799 | * FRCSR 5: | 1804 | * FRCSR 5: |
1800 | */ | 1805 | */ |
1801 | #define RFCSR5_R1 FIELD8(0x0c) | 1806 | #define RFCSR5_R1 FIELD8(0x0c) |
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 165535cc507..006347e4d6e 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c | |||
@@ -1648,7 +1648,10 @@ static void rt2800_config_channel_rf3xxx(struct rt2x00_dev *rt2x00dev, | |||
1648 | u8 rfcsr; | 1648 | u8 rfcsr; |
1649 | 1649 | ||
1650 | rt2800_rfcsr_write(rt2x00dev, 2, rf->rf1); | 1650 | rt2800_rfcsr_write(rt2x00dev, 2, rf->rf1); |
1651 | rt2800_rfcsr_write(rt2x00dev, 3, rf->rf3); | 1651 | |
1652 | rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr); | ||
1653 | rt2x00_set_field8(&rfcsr, RFCSR3_K, rf->rf3); | ||
1654 | rt2800_rfcsr_write(rt2x00dev, 3, rfcsr); | ||
1652 | 1655 | ||
1653 | rt2800_rfcsr_read(rt2x00dev, 6, &rfcsr); | 1656 | rt2800_rfcsr_read(rt2x00dev, 6, &rfcsr); |
1654 | rt2x00_set_field8(&rfcsr, RFCSR6_R1, rf->rf2); | 1657 | rt2x00_set_field8(&rfcsr, RFCSR6_R1, rf->rf2); |