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

Commit 569ffa56 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Fix RFCSR 12 & 13 programming on RT3572 channel switching. 



Align with v2.5.0.0 Ralink RT3572 driver for 2.4GHz band channel switch.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5d137dff

drivers/net/wireless/rt2x00/rt2800lib.c

+2 −4
Original line number Diff line number Diff line
@@ -1783,8 +1783,7 @@ static void rt2800_config_channel_rf3052(struct rt2x00_dev *rt2x00dev, 
	if (rf->channel <= 14) {

		rt2x00_set_field8(&rfcsr, RFCSR12_DR0, 3);

		rt2x00_set_field8(&rfcsr, RFCSR12_TX_POWER,

				(info->default_power1 & 0x3) |

				((info->default_power1 & 0xC) << 1));

				  info->default_power1);

	} else {

		rt2x00_set_field8(&rfcsr, RFCSR12_DR0, 7);

		rt2x00_set_field8(&rfcsr, RFCSR12_TX_POWER,
@@ -1797,8 +1796,7 @@ static void rt2800_config_channel_rf3052(struct rt2x00_dev *rt2x00dev, 
	if (rf->channel <= 14) {

		rt2x00_set_field8(&rfcsr, RFCSR13_DR0, 3);

		rt2x00_set_field8(&rfcsr, RFCSR13_TX_POWER,

				(info->default_power2 & 0x3) |

				((info->default_power2 & 0xC) << 1));

				  info->default_power2);

	} else {

		rt2x00_set_field8(&rfcsr, RFCSR13_DR0, 7);

		rt2x00_set_field8(&rfcsr, RFCSR13_TX_POWER,