diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-16 21:25:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-16 21:25:48 -0400 |
| commit | caea902f72b053fd0c76d0d3b6b2e057beb3fc64 (patch) | |
| tree | 74e8d476b2c51480420e2ef7c9bbae249b6edbc9 /drivers/net/wireless/rt2x00/rt2x00usb.c | |
| parent | 0b4419162aa6c4204843f3a13b48d9ab821d3167 (diff) | |
| parent | 65c3e4715b1b934f8dcc002d9f46b4371ca7a9b1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/rt2x00usb.c
net/sctp/protocol.c
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00usb.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00usb.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index 68d87f09e054..3080969ae5b3 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c | |||
| @@ -345,8 +345,11 @@ void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev) | |||
| 345 | } | 345 | } |
| 346 | 346 | ||
| 347 | /* | 347 | /* |
| 348 | * Kill guardian urb. | 348 | * Kill guardian urb (if required by driver). |
| 349 | */ | 349 | */ |
| 350 | if (!test_bit(DRIVER_REQUIRE_BEACON_GUARD, &rt2x00dev->flags)) | ||
| 351 | return; | ||
| 352 | |||
| 350 | for (i = 0; i < rt2x00dev->bcn->limit; i++) { | 353 | for (i = 0; i < rt2x00dev->bcn->limit; i++) { |
| 351 | bcn_priv = rt2x00dev->bcn->entries[i].priv_data; | 354 | bcn_priv = rt2x00dev->bcn->entries[i].priv_data; |
| 352 | if (bcn_priv->guardian_urb) | 355 | if (bcn_priv->guardian_urb) |