cfg80211: remove enum ieee80211_band
This enum is already perfectly aliased to enum nl80211_band, and the only reason for it is that we get IEEE80211_NUM_BANDS out of it. There's no really good reason to not declare the number of bands in nl80211 though, so do that and remove the cfg80211 one. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
@@ -5836,7 +5836,7 @@ static int airo_get_freq(struct net_device *dev,
|
||||
ch = le16_to_cpu(status_rid.channel);
|
||||
if((ch > 0) && (ch < 15)) {
|
||||
fwrq->m = 100000 *
|
||||
ieee80211_channel_to_frequency(ch, IEEE80211_BAND_2GHZ);
|
||||
ieee80211_channel_to_frequency(ch, NL80211_BAND_2GHZ);
|
||||
fwrq->e = 1;
|
||||
} else {
|
||||
fwrq->m = ch;
|
||||
@@ -6894,7 +6894,7 @@ static int airo_get_range(struct net_device *dev,
|
||||
for(i = 0; i < 14; i++) {
|
||||
range->freq[k].i = i + 1; /* List index */
|
||||
range->freq[k].m = 100000 *
|
||||
ieee80211_channel_to_frequency(i + 1, IEEE80211_BAND_2GHZ);
|
||||
ieee80211_channel_to_frequency(i + 1, NL80211_BAND_2GHZ);
|
||||
range->freq[k++].e = 1; /* Values in MHz -> * 10^5 * 10 */
|
||||
}
|
||||
range->num_frequency = k;
|
||||
@@ -7302,7 +7302,7 @@ static inline char *airo_translate_scan(struct net_device *dev,
|
||||
iwe.cmd = SIOCGIWFREQ;
|
||||
iwe.u.freq.m = le16_to_cpu(bss->dsChannel);
|
||||
iwe.u.freq.m = 100000 *
|
||||
ieee80211_channel_to_frequency(iwe.u.freq.m, IEEE80211_BAND_2GHZ);
|
||||
ieee80211_channel_to_frequency(iwe.u.freq.m, NL80211_BAND_2GHZ);
|
||||
iwe.u.freq.e = 1;
|
||||
current_ev = iwe_stream_add_event(info, current_ev, end_buf,
|
||||
&iwe, IW_EV_FREQ_LEN);
|
||||
|
Reference in New Issue
Block a user