diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-29 15:52:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-29 15:52:56 -0700 |
| commit | ddc9f824b09d790e93a800ba29ff3462f8fb5d0b (patch) | |
| tree | 9cfa54ece40eaed3de7fcfbaf0f01db284e97c16 /drivers/net/wireless/iwlwifi/iwl-scan.c | |
| parent | ac7c992cac0c8f276aa8e4a8273204a6db707bb3 (diff) | |
| parent | c428c89201a57a0ce24c37ed79e540d1f4101cf3 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 23644cf884f1..e7c65c4f741b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -925,11 +925,11 @@ void iwl_bg_scan_completed(struct work_struct *work) IWL_DEBUG_SCAN(priv, "SCAN complete scan\n"); + ieee80211_scan_completed(priv->hw, false); + if (test_bit(STATUS_EXIT_PENDING, &priv->status)) return; - ieee80211_scan_completed(priv->hw, false); - /* Since setting the TXPOWER may have been deferred while * performing the scan, fire one off */ mutex_lock(&priv->mutex); |