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

Commit df71c9cf authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

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: default avatarJustin Piszcz <jpiszcz@lucidpixels.com>
Cc: stable@kernel.org
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4b1bfb7d

drivers/net/wireless/rt2x00/rt2x00usb.c

+7 −10
Original line number Diff line number Diff line
@@ -262,23 +262,20 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb) 
	struct queue_entry *entry = (struct queue_entry *)urb->context;

	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;



	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

	 */

	if (urb->status)

		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

	 * from the device.