diff options
| author | David S. Miller | 2009-05-25 10:42:21 +0200 |
|---|---|---|
| committer | David S. Miller | 2009-05-25 10:42:21 +0200 |
| commit | c649c0e31d5736a4b7c5c3454182091dda4bbe62 (patch) | |
| tree | 93da11bf4ea828611ab5277a7dbadf57724c2b1e /drivers/net/wireless/iwlwifi/iwl-scan.c | |
| parent | mISDN: Added PCI ID for new Junghanns.net Single E1 cards. (diff) | |
| parent | gianfar: fix BUG under load after introduction of skb recycling (diff) | |
| download | kernel-qcow2-linux-c649c0e31d5736a4b7c5c3454182091dda4bbe62.tar.gz kernel-qcow2-linux-c649c0e31d5736a4b7c5c3454182091dda4bbe62.tar.xz kernel-qcow2-linux-c649c0e31d5736a4b7c5c3454182091dda4bbe62.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.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, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index f6d4af5c7509..e26875dbe859 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -227,9 +227,6 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv, /* The HW is no longer scanning */ clear_bit(STATUS_SCAN_HW, &priv->status); - /* The scan completion notification came in, so kill that timer... */ - cancel_delayed_work(&priv->scan_check); - IWL_DEBUG_INFO(priv, "Scan pass on %sGHz took %dms\n", (priv->scan_bands & BIT(IEEE80211_BAND_2GHZ)) ? "2.4" : "5.2", @@ -592,6 +589,8 @@ static void iwl_bg_request_scan(struct work_struct *data) mutex_lock(&priv->mutex); + cancel_delayed_work(&priv->scan_check); + if (!iwl_is_ready(priv)) { IWL_WARN(priv, "request scan called when driver not ready.\n"); goto done; @@ -819,6 +818,8 @@ void iwl_bg_scan_completed(struct work_struct *work) IWL_DEBUG_SCAN(priv, "SCAN complete scan\n"); + cancel_delayed_work(&priv->scan_check); + ieee80211_scan_completed(priv->hw, false); if (test_bit(STATUS_EXIT_PENDING, &priv->status)) |