iwlwifi: fix current channel is not scanned

All channels should be scanned, including the current channel
when the client is associated.

Removed also unused flag to scan only active channels.

Signed-off-by: Guy Cohen <guy.cohen@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 0 insertions, 13 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index a1a0b3c581f1..d723c474f810 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -4968,17 +4968,6 @@ static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv,
                 if (channels[i].flags & IEEE80211_CHAN_DISABLED)
                         continue;
 
-                if (channels[i].hw_value ==
-                    le16_to_cpu(priv->active_rxon.channel)) {
-                        if (iwl3945_is_associated(priv)) {
-                                IWL_DEBUG_SCAN
-                                    ("Skipping current channel %d\n",
-                                     le16_to_cpu(priv->active_rxon.channel));
-                                continue;
-                        }
-                } else if (priv->only_active_channel)
-                        continue;
-
                 scan_ch->channel = channels[i].hw_value;
 
                 ch_info = iwl3945_get_channel_info(priv, band, scan_ch->channel);
@@ -7314,8 +7303,6 @@ static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw)
                 return;
         }
 
-        priv->only_active_channel = 0;
-
         iwl3945_set_rate(priv);
 
         mutex_unlock(&priv->mutex);