summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-06-23 19:56:50 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-06-27 09:09:18 -0400
commit40af48ce501ea9ad9c485504a6fa0740801fa051 (patch)
treea18675a76e5a3e44e6e7064c3b03bebecec41231
parent4e3996fe899651e00d3085110cc6e92f6a78ee3e (diff)
downloadblackbird-op-linux-40af48ce501ea9ad9c485504a6fa0740801fa051.tar.gz
blackbird-op-linux-40af48ce501ea9ad9c485504a6fa0740801fa051.zip
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: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00usb.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 5593b9a83108..83862e7f7aec 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -284,6 +284,7 @@ void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev)
{
struct queue_entry_priv_usb *entry_priv;
struct queue_entry_priv_usb_bcn *bcn_priv;
+ struct data_queue *queue;
unsigned int i;
rt2x00usb_vendor_request_sw(rt2x00dev, USB_RX_CONTROL, 0, 0,
@@ -292,9 +293,11 @@ void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev)
/*
* Cancel all queues.
*/
- for (i = 0; i < rt2x00dev->rx->limit; i++) {
- entry_priv = rt2x00dev->rx->entries[i].priv_data;
- usb_kill_urb(entry_priv->urb);
+ queue_for_each(rt2x00dev, queue) {
+ for (i = 0; i < queue->limit; i++) {
+ entry_priv = queue->entries[i].priv_data;
+ usb_kill_urb(entry_priv->urb);
+ }
}
/*
OpenPOWER on IntegriCloud