iwlwifi: use mac80211 channels for reset scan

Instead of iterating our own channel list,
use the mac80211 channel list since that's
already processed per band and thus makes
for less code.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index ea05ae8280e1cf1fe3f58cf0d8f3510a6448e7b6..069849e6623430f6138c844280be7c658970b70d 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -447,27 +447,17 @@ static u16 iwl_get_passive_dwell_time(struct iwl_priv *priv,
 
 /* Return valid, unused, channel for a passive scan to reset the RF */
 static u8 iwl_get_single_channel_number(struct iwl_priv *priv,
-                                enum ieee80211_band band)
+                                       enum ieee80211_band band)
 {
-       const struct iwl_channel_info *ch_info;
-       int i;
-       u8 channel = 0;
-       u8 min, max;
+       struct ieee80211_supported_band *sband = priv->hw->wiphy->bands[band];
        struct iwl_rxon_context *ctx;
+       int i;
 
-       if (band == IEEE80211_BAND_5GHZ) {
-               min = 14;
-               max = priv->channel_count;
-       } else {
-               min = 0;
-               max = 14;
-       }
-
-       for (i = min; i < max; i++) {
+       for (i = 0; i < sband->n_channels; i++) {
                bool busy = false;
 
                for_each_context(priv, ctx) {
-                       busy = priv->channel_info[i].channel ==
+                       busy = sband->channels[i].hw_value ==
                                le16_to_cpu(ctx->staging.channel);
                        if (busy)
                                break;
@@ -476,13 +466,11 @@ static u8 iwl_get_single_channel_number(struct iwl_priv *priv,
                if (busy)
                        continue;
 
-               channel = priv->channel_info[i].channel;
-               ch_info = iwl_get_channel_info(priv, band, channel);
-               if (is_channel_valid(ch_info))
-                       break;
+               if (!(sband->channels[i].flags & IEEE80211_CHAN_DISABLED))
+                       return sband->channels[i].hw_value;
        }
 
-       return channel;
+       return 0;
 }
 
 static int iwl_get_single_channel_for_scan(struct iwl_priv *priv,