diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-11 09:40:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 09:40:18 +0100 |
| commit | e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9 (patch) | |
| tree | d1c3b22b7e9f02fb56927da530da09c6ee7ce0b9 /drivers/net/wireless/iwlwifi/iwl-scan.c | |
| parent | a309720c876d7ad2e224bfd1982c92ae4364c82e (diff) | |
| parent | 45b86a96f17cb2900f291129b0e67287400e45b2 (diff) | |
| download | talos-op-linux-e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9.tar.gz talos-op-linux-e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9.zip | |
Merge branch 'tracing/urgent' into tracing/ftrace
Conflicts:
kernel/trace/trace.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 3b0bee331a33..c89365e2ca58 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -896,6 +896,13 @@ static void iwl_bg_request_scan(struct work_struct *data) return; done: + /* Cannot perform scan. Make sure we clear scanning + * bits from status so next scan request can be performed. + * If we don't clear scanning status bit here all next scan + * will fail + */ + clear_bit(STATUS_SCAN_HW, &priv->status); + clear_bit(STATUS_SCANNING, &priv->status); /* inform mac80211 scan aborted */ queue_work(priv->workqueue, &priv->scan_completed); mutex_unlock(&priv->mutex); |
