1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 575c1d978288..7b8af9609e08 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3205,12 +3205,14 @@ static int iwl_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t ssid_len)
         /* we don't schedule scan within next_scan_jiffies period */
         if (priv->next_scan_jiffies &&
             time_after(priv->next_scan_jiffies, jiffies)) {
+                IWL_DEBUG_SCAN("scan rejected: within next scan period\n");
                 ret = -EAGAIN;
                 goto out_unlock;
         }
         /* if we just finished scan ask for delay */
-        if (priv->last_scan_jiffies &&
+        if (iwl_is_associated(priv) && priv->last_scan_jiffies &&
             time_after(priv->last_scan_jiffies + IWL_DELAY_NEXT_SCAN, jiffies)) {
+                IWL_DEBUG_SCAN("scan rejected: within previous scan period\n");
                 ret = -EAGAIN;
                 goto out_unlock;
         }