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

Commit a53aff5d authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

rt2x00: rt2800pci: don't use TXWI_DESC_SIZE directly 



Different chipsets may use different TXWI descriptor
size. Instead of using a hardcoded value, use the
'queue->winfo_size' which holds the correct value for
a given device.

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Acked-by: default avatarStanislaw Gruszka <stf_xl@wp.pl>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0a6f3a8e

drivers/net/wireless/rt2x00/rt2800pci.c

+3 −2
Original line number Diff line number Diff line
@@ -637,6 +637,7 @@ static void rt2800pci_write_tx_desc(struct queue_entry *entry, 
	struct queue_entry_priv_mmio *entry_priv = entry->priv_data;

	__le32 *txd = entry_priv->desc;

	u32 word;

	const unsigned int txwi_size = entry->queue->winfo_size;



	/*

	 * The buffers pointed by SD_PTR0/SD_LEN0 and SD_PTR1/SD_LEN1
@@ -659,14 +660,14 @@ static void rt2800pci_write_tx_desc(struct queue_entry *entry, 
			   !test_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W1_BURST,

			   test_bit(ENTRY_TXD_BURST, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W1_SD_LEN0, TXWI_DESC_SIZE);

	rt2x00_set_field32(&word, TXD_W1_SD_LEN0, txwi_size);

	rt2x00_set_field32(&word, TXD_W1_LAST_SEC0, 0);

	rt2x00_set_field32(&word, TXD_W1_DMA_DONE, 0);

	rt2x00_desc_write(txd, 1, word);



	word = 0;

	rt2x00_set_field32(&word, TXD_W2_SD_PTR1,

			   skbdesc->skb_dma + TXWI_DESC_SIZE);

			   skbdesc->skb_dma + txwi_size);

	rt2x00_desc_write(txd, 2, word);



	word = 0;