rt2x00: fix order of entry flags modification
In rt2800usb_work_txdone we check flags in order: - ENTRY_OWNER_DEVICE_DATA - ENTRY_DATA_STATUS_PENDING - ENTRY_DATA_IO_FAILED Modify flags in separate order in rt2x00usb_interrupt_txdone, to avoid processing entries in _txdone with wrong flags or skip processing ready entries. Reported-by: Justin Piszcz <jpiszcz@lucidpixels.com> Cc: stable@kernel.org Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Родитель
4b1bfb7d2d
Коммит
df71c9cfce
|
@ -262,23 +262,20 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)
|
||||||
struct queue_entry *entry = (struct queue_entry *)urb->context;
|
struct queue_entry *entry = (struct queue_entry *)urb->context;
|
||||||
struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
|
struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
|
||||||
|
|
||||||
if (!test_and_clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))
|
if (!test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (rt2x00dev->ops->lib->tx_dma_done)
|
|
||||||
rt2x00dev->ops->lib->tx_dma_done(entry);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Report the frame as DMA done
|
|
||||||
*/
|
|
||||||
rt2x00lib_dmadone(entry);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check if the frame was correctly uploaded
|
* Check if the frame was correctly uploaded
|
||||||
*/
|
*/
|
||||||
if (urb->status)
|
if (urb->status)
|
||||||
set_bit(ENTRY_DATA_IO_FAILED, &entry->flags);
|
set_bit(ENTRY_DATA_IO_FAILED, &entry->flags);
|
||||||
|
/*
|
||||||
|
* Report the frame as DMA done
|
||||||
|
*/
|
||||||
|
rt2x00lib_dmadone(entry);
|
||||||
|
|
||||||
|
if (rt2x00dev->ops->lib->tx_dma_done)
|
||||||
|
rt2x00dev->ops->lib->tx_dma_done(entry);
|
||||||
/*
|
/*
|
||||||
* Schedule the delayed work for reading the TX status
|
* Schedule the delayed work for reading the TX status
|
||||||
* from the device.
|
* from the device.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче