aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 9a7209d075c8..45a684575046 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2881,7 +2881,10 @@ void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
2881 IWL_DEBUG_INFO(priv, "Scanning while associated...\n"); 2881 IWL_DEBUG_INFO(priv, "Scanning while associated...\n");
2882 2882
2883 spin_lock_irqsave(&priv->lock, flags); 2883 spin_lock_irqsave(&priv->lock, flags);
2884 interval = vif ? vif->bss_conf.beacon_int : 0; 2884 if (priv->is_internal_short_scan)
2885 interval = 0;
2886 else
2887 interval = vif->bss_conf.beacon_int;
2885 spin_unlock_irqrestore(&priv->lock, flags); 2888 spin_unlock_irqrestore(&priv->lock, flags);
2886 2889
2887 scan->suspend_time = 0; 2890 scan->suspend_time = 0;