diff options
| author | Gertjan van Wingerde | 2010-05-11 23:51:39 +0200 |
|---|---|---|
| committer | John W. Linville | 2010-05-12 22:41:44 +0200 |
| commit | e01f1ec35ff91c8a3f4a3e48a0c8ab476124b973 (patch) | |
| tree | 495949f825157e5dc00694856e35eaa83afe0bb0 /drivers/net/wireless/rt2x00/rt2500pci.c | |
| parent | rt2x00: Fix beacon descriptor writing for rt61pci. (diff) | |
| download | kernel-qcow2-linux-e01f1ec35ff91c8a3f4a3e48a0c8ab476124b973.tar.gz kernel-qcow2-linux-e01f1ec35ff91c8a3f4a3e48a0c8ab476124b973.tar.xz kernel-qcow2-linux-e01f1ec35ff91c8a3f4a3e48a0c8ab476124b973.zip | |
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/rt2500pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2500pci.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index d876c6d87591..8d3e95e0dcfe 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/rt2x00/rt2500pci.c @@ -1193,6 +1193,11 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, test_bit(ENTRY_TXD_RTS_FRAME, &txdesc->flags)); rt2x00_desc_write(txd, 10, word); + /* + * Writing TXD word 0 must the last to prevent a race condition with + * the device, whereby the device may take hold of the TXD before we + * finished updating it. + */ rt2x00_desc_read(txd, 0, &word); rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 1); rt2x00_set_field32(&word, TXD_W0_VALID, 1); |