diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2008-02-10 16:52:36 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-02-29 15:37:21 -0500 |
commit | 330e3f95b30d9616edd6df7646473179c159c00d (patch) | |
tree | 1c32b7cbfc75543f7e3916e8c2a3536b23e91044 /drivers/net | |
parent | c1aa3dc7acc6b97a6251f9d000494569d57fddca (diff) |
rt2x00: Kill guardian urb during disable_radio
When the radio is being disabled we should also
kill the guardian urb which could still be pending
in the device.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00usb.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index 450043b61773..6cb4432e1ee0 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c | |||
@@ -378,6 +378,7 @@ void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev) | |||
378 | { | 378 | { |
379 | struct queue_entry_priv_usb_rx *priv_rx; | 379 | struct queue_entry_priv_usb_rx *priv_rx; |
380 | struct queue_entry_priv_usb_tx *priv_tx; | 380 | struct queue_entry_priv_usb_tx *priv_tx; |
381 | struct queue_entry_priv_usb_bcn *priv_bcn; | ||
381 | struct data_queue *queue; | 382 | struct data_queue *queue; |
382 | unsigned int i; | 383 | unsigned int i; |
383 | 384 | ||
@@ -392,12 +393,28 @@ void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev) | |||
392 | usb_kill_urb(priv_rx->urb); | 393 | usb_kill_urb(priv_rx->urb); |
393 | } | 394 | } |
394 | 395 | ||
395 | txall_queue_for_each(rt2x00dev, queue) { | 396 | tx_queue_for_each(rt2x00dev, queue) { |
396 | for (i = 0; i < queue->limit; i++) { | 397 | for (i = 0; i < queue->limit; i++) { |
397 | priv_tx = queue->entries[i].priv_data; | 398 | priv_tx = queue->entries[i].priv_data; |
398 | usb_kill_urb(priv_tx->urb); | 399 | usb_kill_urb(priv_tx->urb); |
399 | } | 400 | } |
400 | } | 401 | } |
402 | |||
403 | for (i = 0; i < rt2x00dev->bcn->limit; i++) { | ||
404 | priv_bcn = rt2x00dev->bcn->entries[i].priv_data; | ||
405 | usb_kill_urb(priv_bcn->urb); | ||
406 | |||
407 | if (priv_bcn->guardian_urb) | ||
408 | usb_kill_urb(priv_bcn->guardian_urb); | ||
409 | } | ||
410 | |||
411 | if (!test_bit(DRIVER_REQUIRE_ATIM_QUEUE, &rt2x00dev->flags)) | ||
412 | return; | ||
413 | |||
414 | for (i = 0; i < rt2x00dev->bcn[1].limit; i++) { | ||
415 | priv_tx = rt2x00dev->bcn[1].entries[i].priv_data; | ||
416 | usb_kill_urb(priv_tx->urb); | ||
417 | } | ||
401 | } | 418 | } |
402 | EXPORT_SYMBOL_GPL(rt2x00usb_disable_radio); | 419 | EXPORT_SYMBOL_GPL(rt2x00usb_disable_radio); |
403 | 420 | ||