1 files changed, 20 insertions, 20 deletions

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 9f440a9de63b..f36039888eb5 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -47,7 +47,7 @@ u32 ieee80211_mandatory_rates(struct ieee80211_supported_band *sband,
         if (WARN_ON(!sband))
                 return 1;
 
-        if (sband->band == IEEE80211_BAND_2GHZ) {
+        if (sband->band == NL80211_BAND_2GHZ) {
                 if (scan_width == NL80211_BSS_CHAN_WIDTH_5 ||
                     scan_width == NL80211_BSS_CHAN_WIDTH_10)
                         mandatory_flag = IEEE80211_RATE_MANDATORY_G;
@@ -65,26 +65,26 @@ u32 ieee80211_mandatory_rates(struct ieee80211_supported_band *sband,
 }
 EXPORT_SYMBOL(ieee80211_mandatory_rates);
 
-int ieee80211_channel_to_frequency(int chan, enum ieee80211_band band)
+int ieee80211_channel_to_frequency(int chan, enum nl80211_band band)
 {
         /* see 802.11 17.3.8.3.2 and Annex J
          * there are overlapping channel numbers in 5GHz and 2GHz bands */
         if (chan <= 0)
                 return 0; /* not supported */
         switch (band) {
-        case IEEE80211_BAND_2GHZ:
+        case NL80211_BAND_2GHZ:
                 if (chan == 14)
                         return 2484;
                 else if (chan < 14)
                         return 2407 + chan * 5;
                 break;
-        case IEEE80211_BAND_5GHZ:
+        case NL80211_BAND_5GHZ:
                 if (chan >= 182 && chan <= 196)
                         return 4000 + chan * 5;
                 else
                         return 5000 + chan * 5;
                 break;
-        case IEEE80211_BAND_60GHZ:
+        case NL80211_BAND_60GHZ:
                 if (chan < 5)
                         return 56160 + chan * 2160;
                 break;
@@ -116,11 +116,11 @@ EXPORT_SYMBOL(ieee80211_frequency_to_channel);
 struct ieee80211_channel *__ieee80211_get_channel(struct wiphy *wiphy,
                                                   int freq)
 {
-        enum ieee80211_band band;
+        enum nl80211_band band;
         struct ieee80211_supported_band *sband;
         int i;
 
-        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+        for (band = 0; band < NUM_NL80211_BANDS; band++) {
                 sband = wiphy->bands[band];
 
                 if (!sband)
@@ -137,12 +137,12 @@ struct ieee80211_channel *__ieee80211_get_channel(struct wiphy *wiphy,
 EXPORT_SYMBOL(__ieee80211_get_channel);
 
 static void set_mandatory_flags_band(struct ieee80211_supported_band *sband,
-                                     enum ieee80211_band band)
+                                     enum nl80211_band band)
 {
         int i, want;
 
         switch (band) {
-        case IEEE80211_BAND_5GHZ:
+        case NL80211_BAND_5GHZ:
                 want = 3;
                 for (i = 0; i < sband->n_bitrates; i++) {
                         if (sband->bitrates[i].bitrate == 60 ||
@@ -155,7 +155,7 @@ static void set_mandatory_flags_band(struct ieee80211_supported_band *sband,
                 }
                 WARN_ON(want);
                 break;
-        case IEEE80211_BAND_2GHZ:
+        case NL80211_BAND_2GHZ:
                 want = 7;
                 for (i = 0; i < sband->n_bitrates; i++) {
                         if (sband->bitrates[i].bitrate == 10) {
@@ -185,12 +185,12 @@ static void set_mandatory_flags_band(struct ieee80211_supported_band *sband,
                 }
                 WARN_ON(want != 0 && want != 3 && want != 6);
                 break;
-        case IEEE80211_BAND_60GHZ:
+        case NL80211_BAND_60GHZ:
                 /* check for mandatory HT MCS 1..4 */
                 WARN_ON(!sband->ht_cap.ht_supported);
                 WARN_ON((sband->ht_cap.mcs.rx_mask[0] & 0x1e) != 0x1e);
                 break;
-        case IEEE80211_NUM_BANDS:
+        case NUM_NL80211_BANDS:
                 WARN_ON(1);
                 break;
         }
@@ -198,9 +198,9 @@ static void set_mandatory_flags_band(struct ieee80211_supported_band *sband,
 
 void ieee80211_set_bitrate_flags(struct wiphy *wiphy)
 {
-        enum ieee80211_band band;
+        enum nl80211_band band;
 
-        for (band = 0; band < IEEE80211_NUM_BANDS; band++)
+        for (band = 0; band < NUM_NL80211_BANDS; band++)
                 if (wiphy->bands[band])
                         set_mandatory_flags_band(wiphy->bands[band], band);
 }
@@ -1399,22 +1399,22 @@ size_t ieee80211_ie_split_ric(const u8 *ies, size_t ielen,
 EXPORT_SYMBOL(ieee80211_ie_split_ric);
 
 bool ieee80211_operating_class_to_band(u8 operating_class,
-                                       enum ieee80211_band *band)
+                                       enum nl80211_band *band)
 {
         switch (operating_class) {
         case 112:
         case 115 ... 127:
         case 128 ... 130:
-                *band = IEEE80211_BAND_5GHZ;
+                *band = NL80211_BAND_5GHZ;
                 return true;
         case 81:
         case 82:
         case 83:
         case 84:
-                *band = IEEE80211_BAND_2GHZ;
+                *band = NL80211_BAND_2GHZ;
                 return true;
         case 180:
-                *band = IEEE80211_BAND_60GHZ;
+                *band = NL80211_BAND_60GHZ;
                 return true;
         }
 
@@ -1726,10 +1726,10 @@ int ieee80211_get_ratemask(struct ieee80211_supported_band *sband,
 
 unsigned int ieee80211_get_num_supported_channels(struct wiphy *wiphy)
 {
-        enum ieee80211_band band;
+        enum nl80211_band band;
         unsigned int n_channels = 0;
 
-        for (band = 0; band < IEEE80211_NUM_BANDS; band++)
+        for (band = 0; band < NUM_NL80211_BANDS; band++)
                 if (wiphy->bands[band])
                         n_channels += wiphy->bands[band]->n_channels;