diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index f786a407638f..501477464e07 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |||
@@ -250,8 +250,6 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv, | |||
250 | 250 | ||
251 | if (!priv->is_internal_short_scan) | 251 | if (!priv->is_internal_short_scan) |
252 | priv->next_scan_jiffies = 0; | 252 | priv->next_scan_jiffies = 0; |
253 | else | ||
254 | priv->last_internal_scan_jiffies = jiffies; | ||
255 | 253 | ||
256 | IWL_DEBUG_INFO(priv, "Setting scan to off\n"); | 254 | IWL_DEBUG_INFO(priv, "Setting scan to off\n"); |
257 | 255 | ||
@@ -551,8 +549,6 @@ EXPORT_SYMBOL(iwl_mac_hw_scan); | |||
551 | * internal short scan, this function should only been called while associated. | 549 | * internal short scan, this function should only been called while associated. |
552 | * It will reset and tune the radio to prevent possible RF related problem | 550 | * It will reset and tune the radio to prevent possible RF related problem |
553 | */ | 551 | */ |
554 | #define IWL_DELAY_NEXT_INTERNAL_SCAN (HZ*1) | ||
555 | |||
556 | int iwl_internal_short_hw_scan(struct iwl_priv *priv) | 552 | int iwl_internal_short_hw_scan(struct iwl_priv *priv) |
557 | { | 553 | { |
558 | int ret = 0; | 554 | int ret = 0; |
@@ -572,12 +568,6 @@ int iwl_internal_short_hw_scan(struct iwl_priv *priv) | |||
572 | ret = -EAGAIN; | 568 | ret = -EAGAIN; |
573 | goto out; | 569 | goto out; |
574 | } | 570 | } |
575 | if (priv->last_internal_scan_jiffies && | ||
576 | time_after(priv->last_internal_scan_jiffies + | ||
577 | IWL_DELAY_NEXT_INTERNAL_SCAN, jiffies)) { | ||
578 | IWL_DEBUG_SCAN(priv, "internal scan rejected\n"); | ||
579 | goto out; | ||
580 | } | ||
581 | 571 | ||
582 | priv->scan_bands = 0; | 572 | priv->scan_bands = 0; |
583 | if (priv->band == IEEE80211_BAND_5GHZ) | 573 | if (priv->band == IEEE80211_BAND_5GHZ) |