diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-14 17:33:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-14 17:33:38 -0700 |
| commit | 34a5d713056c325e5bf2b5361646585d5f550a72 (patch) | |
| tree | d2dc0fb65b30469c877e79bc70c7345097aef31c /drivers/net/wireless/rt2x00/rt2x00usb.c | |
| parent | 7775c9753b94fe429dc4323360d6502c95e0dd6e (diff) | |
| parent | cb62eccd7d946f7fb92b8beb79988726ec92c227 (diff) | |
| download | op-kernel-dev-34a5d713056c325e5bf2b5361646585d5f550a72.zip op-kernel-dev-34a5d713056c325e5bf2b5361646585d5f550a72.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00usb.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00usb.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index 5a33167..e5ceae8 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c @@ -362,6 +362,12 @@ void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev) } } + /* + * Kill guardian urb (if required by driver). + */ + if (!test_bit(DRIVER_REQUIRE_BEACON_GUARD, &rt2x00dev->flags)) + return; + for (i = 0; i < rt2x00dev->bcn->limit; i++) { priv_bcn = rt2x00dev->bcn->entries[i].priv_data; usb_kill_urb(priv_bcn->urb); |
