diff options
author | David S. Miller <davem@davemloft.net> | 2009-05-21 00:31:25 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-21 00:31:25 (GMT) |
commit | 86c2fe1e3adacec9204c03f2b056b49534ecf0ed (patch) | |
tree | 9d6a2c3f3802cd83d5a266df1d2576bd77aaad93 /drivers/net/wireless/iwlwifi/iwl3945-base.c | |
parent | 1ddbcb005c395518c2cd0df504cff3d4b5c85853 (diff) | |
parent | a6c67339784db5763d6f20ae1881aeebe8c5a9f4 (diff) | |
download | linux-fsl-qoriq-86c2fe1e3adacec9204c03f2b056b49534ecf0ed.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 4cce661..ff4d0e4 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -782,13 +782,6 @@ static int iwl3945_set_mode(struct iwl_priv *priv, int mode) if (!iwl_is_ready_rf(priv)) return -EAGAIN; - cancel_delayed_work(&priv->scan_check); - if (iwl_scan_cancel_timeout(priv, 100)) { - IWL_WARN(priv, "Aborted scan still in progress after 100ms\n"); - IWL_DEBUG_MAC80211(priv, "leaving - scan abort failed.\n"); - return -EAGAIN; - } - iwl3945_commit_rxon(priv); return 0; @@ -3298,6 +3291,8 @@ static void iwl3945_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; |