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

Commit 40af48ce authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: kill URB for all TX queues during disable_radio() 



During rt2x00usb_disable_radio() all pending urb's should
be killed and not only those from the RX queue.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4e3996fe

drivers/net/wireless/rt2x00/rt2x00usb.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -284,6 +284,7 @@ void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev) 
{

{

	struct queue_entry_priv_usb *entry_priv;

	struct queue_entry_priv_usb *entry_priv;

	struct queue_entry_priv_usb_bcn *bcn_priv;

	struct queue_entry_priv_usb_bcn *bcn_priv;

	struct data_queue *queue;

	unsigned int i;

	unsigned int i;





	rt2x00usb_vendor_request_sw(rt2x00dev, USB_RX_CONTROL, 0, 0,

	rt2x00usb_vendor_request_sw(rt2x00dev, USB_RX_CONTROL, 0, 0,
@@ -292,10 +293,12 @@ void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev) 
	/*

	/*

	 * Cancel all queues.

	 * Cancel all queues.

	 */

	 */

	for (i = 0; i < rt2x00dev->rx->limit; i++) {

	queue_for_each(rt2x00dev, queue) {

		entry_priv = rt2x00dev->rx->entries[i].priv_data;

		for (i = 0; i < queue->limit; i++) {

			entry_priv = queue->entries[i].priv_data;

			usb_kill_urb(entry_priv->urb);

			usb_kill_urb(entry_priv->urb);

		}

		}

	}





	/*

	/*

	 * Kill guardian urb (if required by driver).

	 * Kill guardian urb (if required by driver).