--- drivers/net/wireless/iwlwifi/iwl-scan.c

+++ drivers/net/wireless/iwlwifi/iwl-scan.c

@@ -405,21 +405,6 @@ void iwl_init_scan_params(struct iwl_pri

static int iwl_scan_initiate(struct iwl_priv *priv)

{

- if (!iwl_is_ready_rf(priv)) {

- IWL_DEBUG_SCAN(priv, "Aborting scan due to not ready.\n");

- return -EIO;

- }

-

- if (test_bit(STATUS_SCANNING, &priv->status)) {

- IWL_DEBUG_SCAN(priv, "Scan already in progress.\n");

- return -EAGAIN;

- }

-

- if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) {

- IWL_DEBUG_SCAN(priv, "Scan request while abort pending\n");

- return -EAGAIN;

- }

-

IWL_DEBUG_INFO(priv, "Starting scan...\n");

set_bit(STATUS_SCANNING, &priv->status);

priv->scan_start = jiffies;

@@ -450,6 +435,18 @@ int iwl_mac_hw_scan(struct ieee80211_hw

goto out_unlock;

}

+ if (test_bit(STATUS_SCANNING, &priv->status)) {

+ IWL_DEBUG_SCAN(priv, "Scan already in progress.\n");

+ ret = -EAGAIN;

+ goto out_unlock;

+ }

+

+ if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) {

+ IWL_DEBUG_SCAN(priv, "Scan request while abort pending\n");

+ ret = -EAGAIN;

+ goto out_unlock;

+ }

+

/* We don't schedule scan within next_scan_jiffies period.

* Avoid scanning during possible EAPOL exchange, return

* success immediately.

@@ -802,6 +799,7 @@ void iwl_bg_abort_scan(struct work_struc

mutex_lock(&priv->mutex);

+ cancel_delayed_work_sync(&priv->scan_check);

set_bit(STATUS_SCAN_ABORTING, &priv->status);

iwl_send_scan_abort(priv);