cfg80211: remove enum ieee80211_band

[cascardo/linux.git] / drivers / net / wireless / broadcom / brcm80211 / brcmsmac / channel.c

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c
index 38bd589..3a03287 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c
@@ -636,7 +636,7 @@ static void brcms_reg_apply_radar_flags(struct wiphy *wiphy)
        struct ieee80211_channel *ch;
        int i;
 
-       sband = wiphy->bands[IEEE80211_BAND_5GHZ];
+       sband = wiphy->bands[NL80211_BAND_5GHZ];
        if (!sband)
                return;
 
@@ -666,7 +666,7 @@ brcms_reg_apply_beaconing_flags(struct wiphy *wiphy,
        const struct ieee80211_reg_rule *rule;
        int band, i;
 
-       for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+       for (band = 0; band < NUM_NL80211_BANDS; band++) {
                sband = wiphy->bands[band];
                if (!sband)
                        continue;
@@ -710,7 +710,7 @@ static void brcms_reg_notifier(struct wiphy *wiphy,
                brcms_reg_apply_beaconing_flags(wiphy, request->initiator);
 
        /* Disable radio if all channels disallowed by regulatory */
-       for (band = 0; !ch_found && band < IEEE80211_NUM_BANDS; band++) {
+       for (band = 0; !ch_found && band < NUM_NL80211_BANDS; band++) {
                sband = wiphy->bands[band];
                if (!sband)
                        continue;
@@ -755,9 +755,9 @@ void brcms_c_regd_init(struct brcms_c_info *wlc)
                                              &sup_chan);
 
                if (band_idx == BAND_2G_INDEX)
-                       sband = wiphy->bands[IEEE80211_BAND_2GHZ];
+                       sband = wiphy->bands[NL80211_BAND_2GHZ];
                else
-                       sband = wiphy->bands[IEEE80211_BAND_5GHZ];
+                       sband = wiphy->bands[NL80211_BAND_5GHZ];
 
                for (i = 0; i < sband->n_channels; i++) {
                        ch = &sband->channels[i];