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

Commit 5a673964 authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

rt2x00: rt2800: use tx_power2 in rt2800_config_channel_rf3xxx 



Get closer to what the ralink driver does by setting the rf register 13
to tx_power2 during channel switch.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2caaa5d3

drivers/net/wireless/rt2x00/rt2800.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -1565,6 +1565,11 @@ struct mac_iveiv_entry { 
 */

 */

#define RFCSR12_TX_POWER		FIELD8(0x1f)

#define RFCSR12_TX_POWER		FIELD8(0x1f)





/*

 * RFCSR 13:

 */

#define RFCSR13_TX_POWER		FIELD8(0x1f)



/*

/*

 * RFCSR 15:

 * RFCSR 15:

 */

 */

drivers/net/wireless/rt2x00/rt2800lib.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -793,6 +793,11 @@ static void rt2800_config_channel_rf3xxx(struct rt2x00_dev *rt2x00dev, 
			  TXPOWER_G_TO_DEV(info->tx_power1));

			  TXPOWER_G_TO_DEV(info->tx_power1));

	rt2800_rfcsr_write(rt2x00dev, 12, rfcsr);

	rt2800_rfcsr_write(rt2x00dev, 12, rfcsr);





	rt2800_rfcsr_read(rt2x00dev, 13, &rfcsr);

	rt2x00_set_field8(&rfcsr, RFCSR13_TX_POWER,

			  TXPOWER_G_TO_DEV(info->tx_power2));

	rt2800_rfcsr_write(rt2x00dev, 13, rfcsr);



	rt2800_rfcsr_read(rt2x00dev, 23, &rfcsr);

	rt2800_rfcsr_read(rt2x00dev, 23, &rfcsr);

	rt2x00_set_field8(&rfcsr, RFCSR23_FREQ_OFFSET, rt2x00dev->freq_offset);

	rt2x00_set_field8(&rfcsr, RFCSR23_FREQ_OFFSET, rt2x00dev->freq_offset);

	rt2800_rfcsr_write(rt2x00dev, 23, rfcsr);

	rt2800_rfcsr_write(rt2x00dev, 23, rfcsr);