1 files changed, 7 insertions, 7 deletions

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 50ea8e3fcbeb..abdf651a70d9 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -531,7 +531,7 @@ static int cmp_bss(struct cfg80211_bss *a,
 }
 
 static bool cfg80211_bss_type_match(u16 capability,
-                                    enum ieee80211_band band,
+                                    enum nl80211_band band,
                                     enum ieee80211_bss_type bss_type)
 {
         bool ret = true;
@@ -540,7 +540,7 @@ static bool cfg80211_bss_type_match(u16 capability,
         if (bss_type == IEEE80211_BSS_TYPE_ANY)
                 return ret;
 
-        if (band == IEEE80211_BAND_60GHZ) {
+        if (band == NL80211_BAND_60GHZ) {
                 mask = WLAN_CAPABILITY_DMG_TYPE_MASK;
                 switch (bss_type) {
                 case IEEE80211_BSS_TYPE_ESS:
@@ -1006,7 +1006,7 @@ cfg80211_inform_bss_data(struct wiphy *wiphy,
         if (!res)
                 return NULL;
 
-        if (channel->band == IEEE80211_BAND_60GHZ) {
+        if (channel->band == NL80211_BAND_60GHZ) {
                 bss_type = res->pub.capability & WLAN_CAPABILITY_DMG_TYPE_MASK;
                 if (bss_type == WLAN_CAPABILITY_DMG_TYPE_AP ||
                     bss_type == WLAN_CAPABILITY_DMG_TYPE_PBSS)
@@ -1089,7 +1089,7 @@ cfg80211_inform_bss_frame_data(struct wiphy *wiphy,
         if (!res)
                 return NULL;
 
-        if (channel->band == IEEE80211_BAND_60GHZ) {
+        if (channel->band == NL80211_BAND_60GHZ) {
                 bss_type = res->pub.capability & WLAN_CAPABILITY_DMG_TYPE_MASK;
                 if (bss_type == WLAN_CAPABILITY_DMG_TYPE_AP ||
                     bss_type == WLAN_CAPABILITY_DMG_TYPE_PBSS)
@@ -1185,7 +1185,7 @@ int cfg80211_wext_siwscan(struct net_device *dev,
         struct iw_scan_req *wreq = NULL;
         struct cfg80211_scan_request *creq = NULL;
         int i, err, n_channels = 0;
-        enum ieee80211_band band;
+        enum nl80211_band band;
 
         if (!netif_running(dev))
                 return -ENETDOWN;
@@ -1229,7 +1229,7 @@ int cfg80211_wext_siwscan(struct net_device *dev,
 
         /* translate "Scan on frequencies" request */
         i = 0;
-        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+        for (band = 0; band < NUM_NL80211_BANDS; band++) {
                 int j;
 
                 if (!wiphy->bands[band])
@@ -1289,7 +1289,7 @@ int cfg80211_wext_siwscan(struct net_device *dev,
                         creq->n_ssids = 0;
         }
 
-        for (i = 0; i < IEEE80211_NUM_BANDS; i++)
+        for (i = 0; i < NUM_NL80211_BANDS; i++)
                 if (wiphy->bands[i])
                         creq->rates[i] = (1 << wiphy->bands[i]->n_bitrates) - 1;