diff options
author | Gertjan van Wingerde <gwingerde@gmail.com> | 2010-05-11 17:51:39 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-05-12 16:41:44 -0400 |
commit | e01f1ec35ff91c8a3f4a3e48a0c8ab476124b973 (patch) | |
tree | 495949f825157e5dc00694856e35eaa83afe0bb0 /drivers/net/wireless/rt2x00/rt61pci.c | |
parent | 6b97cb04f2766513c57b57f8ac4b44915296230f (diff) |
rt2x00: Re-order tx descriptor writing code in drivers.
Where possible, write the tx descriptor words from start to end, to
follow a logical ordering of words.
Where this is not possible (in rt2400pci, rt2500pci and rt61pci) add
a comment as to why word 0 needs to be written last.
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt61pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 99c298100fb6..55aa010aeee2 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
@@ -1813,6 +1813,11 @@ static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, | |||
1813 | rt2x00_desc_write(txd, 11, word); | 1813 | rt2x00_desc_write(txd, 11, word); |
1814 | } | 1814 | } |
1815 | 1815 | ||
1816 | /* | ||
1817 | * Writing TXD word 0 must the last to prevent a race condition with | ||
1818 | * the device, whereby the device may take hold of the TXD before we | ||
1819 | * finished updating it. | ||
1820 | */ | ||
1816 | rt2x00_desc_read(txd, 0, &word); | 1821 | rt2x00_desc_read(txd, 0, &word); |
1817 | rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 1); | 1822 | rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 1); |
1818 | rt2x00_set_field32(&word, TXD_W0_VALID, 1); | 1823 | rt2x00_set_field32(&word, TXD_W0_VALID, 1); |