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

Commit ac1aa7e4 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Send frames out with configured TX power 



mac80211 sends the txpower to use during config(),
we already store it in the rt2x00_dev structure.
When writing the descriptor correctly initialize
the txpower field with this value to make sure
all frames are send out with the correct tx power.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d3f5feaa

drivers/net/wireless/rt2x00/rt61pci.c

+1 −3
Original line number Diff line number Diff line
@@ -1504,10 +1504,8 @@ static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_desc_write(txd, 2, word);



	rt2x00_desc_read(txd, 5, &word);

/* XXX: removed for now

	rt2x00_set_field32(&word, TXD_W5_TX_POWER,

			   TXPOWER_TO_DEV(control->power_level));

 */

			   TXPOWER_TO_DEV(rt2x00dev->tx_power));

	rt2x00_set_field32(&word, TXD_W5_WAITING_DMA_DONE_INT, 1);

	rt2x00_desc_write(txd, 5, word);

drivers/net/wireless/rt2x00/rt73usb.c

+1 −3
Original line number Diff line number Diff line
@@ -1240,10 +1240,8 @@ static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_desc_write(txd, 2, word);



	rt2x00_desc_read(txd, 5, &word);

/* XXX: removed for now

	rt2x00_set_field32(&word, TXD_W5_TX_POWER,

			   TXPOWER_TO_DEV(control->power_level));

 */

			   TXPOWER_TO_DEV(rt2x00dev->tx_power));

	rt2x00_set_field32(&word, TXD_W5_WAITING_DMA_DONE_INT, 1);

	rt2x00_desc_write(txd, 5, word);