|
@@ -219,16 +219,12 @@ int iwlcore_init_geos(struct iwl_priv *priv)
|
|
if (!is_channel_valid(ch))
|
|
if (!is_channel_valid(ch))
|
|
continue;
|
|
continue;
|
|
|
|
|
|
- if (is_channel_a_band(ch))
|
|
|
|
- sband = &priv->bands[IEEE80211_BAND_5GHZ];
|
|
|
|
- else
|
|
|
|
- sband = &priv->bands[IEEE80211_BAND_2GHZ];
|
|
|
|
|
|
+ sband = &priv->bands[ch->band];
|
|
|
|
|
|
geo_ch = &sband->channels[sband->n_channels++];
|
|
geo_ch = &sband->channels[sband->n_channels++];
|
|
|
|
|
|
geo_ch->center_freq =
|
|
geo_ch->center_freq =
|
|
- ieee80211_channel_to_frequency(ch->channel,
|
|
|
|
- sband->band);
|
|
|
|
|
|
+ ieee80211_channel_to_frequency(ch->channel, ch->band);
|
|
geo_ch->max_power = ch->max_power_avg;
|
|
geo_ch->max_power = ch->max_power_avg;
|
|
geo_ch->max_antenna_gain = 0xff;
|
|
geo_ch->max_antenna_gain = 0xff;
|
|
geo_ch->hw_value = ch->channel;
|
|
geo_ch->hw_value = ch->channel;
|