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>

1 files changed, 7 insertions, 7 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index d3c75ac8a029..885f4ca0888d 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -661,7 +661,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
 
         capab = WLAN_CAPABILITY_ESS;
 
-        if (sband->band == IEEE80211_BAND_2GHZ) {
+        if (sband->band == NL80211_BAND_2GHZ) {
                 capab |= WLAN_CAPABILITY_SHORT_SLOT_TIME;
                 capab |= WLAN_CAPABILITY_SHORT_PREAMBLE;
         }
@@ -1100,7 +1100,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
         struct cfg80211_bss *cbss = ifmgd->associated;
         struct ieee80211_chanctx_conf *conf;
         struct ieee80211_chanctx *chanctx;
-        enum ieee80211_band current_band;
+        enum nl80211_band current_band;
         struct ieee80211_csa_ie csa_ie;
         struct ieee80211_channel_switch ch_switch;
         int res;
@@ -1257,11 +1257,11 @@ ieee80211_find_80211h_pwr_constr(struct ieee80211_sub_if_data *sdata,
         default:
                 WARN_ON_ONCE(1);
                 /* fall through */
-        case IEEE80211_BAND_2GHZ:
-        case IEEE80211_BAND_60GHZ:
+        case NL80211_BAND_2GHZ:
+        case NL80211_BAND_60GHZ:
                 chan_increment = 1;
                 break;
-        case IEEE80211_BAND_5GHZ:
+        case NL80211_BAND_5GHZ:
                 chan_increment = 4;
                 break;
         }
@@ -1861,7 +1861,7 @@ static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata,
         }
 
         use_short_slot = !!(capab & WLAN_CAPABILITY_SHORT_SLOT_TIME);
-        if (ieee80211_get_sdata_band(sdata) == IEEE80211_BAND_5GHZ)
+        if (ieee80211_get_sdata_band(sdata) == NL80211_BAND_5GHZ)
                 use_short_slot = true;
 
         if (use_protection != bss_conf->use_cts_prot) {
@@ -4375,7 +4375,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
                 sdata->vif.bss_conf.basic_rates = basic_rates;
 
                 /* cf. IEEE 802.11 9.2.12 */
-                if (cbss->channel->band == IEEE80211_BAND_2GHZ &&
+                if (cbss->channel->band == NL80211_BAND_2GHZ &&
                     have_higher_than_11mbit)
                         sdata->flags |= IEEE80211_SDATA_OPERATING_GMODE;
                 else