cfg80211: remove enum ieee80211_band

[cascardo/linux.git] / drivers / net / wireless / ti / wl18xx / main.c

diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 1bf26cc..ae47c79 100644 (file)
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -137,8 +137,8 @@ static const u8 wl18xx_rate_to_idx_5ghz[] = {
 };
 
 static const u8 *wl18xx_band_rate_to_idx[] = {
-       [IEEE80211_BAND_2GHZ] = wl18xx_rate_to_idx_2ghz,
-       [IEEE80211_BAND_5GHZ] = wl18xx_rate_to_idx_5ghz
+       [NL80211_BAND_2GHZ] = wl18xx_rate_to_idx_2ghz,
+       [NL80211_BAND_5GHZ] = wl18xx_rate_to_idx_5ghz
 };
 
 enum wl18xx_hw_rates {
@@ -1302,12 +1302,12 @@ static u32 wl18xx_ap_get_mimo_wide_rate_mask(struct wl1271 *wl,
                wl1271_debug(DEBUG_ACX, "using wide channel rate mask");
 
                /* sanity check - we don't support this */
-               if (WARN_ON(wlvif->band != IEEE80211_BAND_5GHZ))
+               if (WARN_ON(wlvif->band != NL80211_BAND_5GHZ))
                        return 0;
 
                return CONF_TX_RATE_USE_WIDE_CHAN;
        } else if (wl18xx_is_mimo_supported(wl) &&
-                  wlvif->band == IEEE80211_BAND_2GHZ) {
+                  wlvif->band == NL80211_BAND_2GHZ) {
                wl1271_debug(DEBUG_ACX, "using MIMO rate mask");
                /*
                 * we don't care about HT channel here - if a peer doesn't
@@ -1996,24 +1996,24 @@ static int wl18xx_setup(struct wl1271 *wl)
                 * siso40.
                 */
                if (wl18xx_is_mimo_supported(wl))
-                       wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ,
+                       wlcore_set_ht_cap(wl, NL80211_BAND_2GHZ,
                                          &wl18xx_mimo_ht_cap_2ghz);
                else
-                       wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ,
+                       wlcore_set_ht_cap(wl, NL80211_BAND_2GHZ,
                                          &wl18xx_siso40_ht_cap_2ghz);
 
                /* 5Ghz is always wide */
-               wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ,
+               wlcore_set_ht_cap(wl, NL80211_BAND_5GHZ,
                                  &wl18xx_siso40_ht_cap_5ghz);
        } else if (priv->conf.ht.mode == HT_MODE_WIDE) {
-               wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ,
+               wlcore_set_ht_cap(wl, NL80211_BAND_2GHZ,
                                  &wl18xx_siso40_ht_cap_2ghz);
-               wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ,
+               wlcore_set_ht_cap(wl, NL80211_BAND_5GHZ,
                                  &wl18xx_siso40_ht_cap_5ghz);
        } else if (priv->conf.ht.mode == HT_MODE_SISO20) {
-               wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ,
+               wlcore_set_ht_cap(wl, NL80211_BAND_2GHZ,
                                  &wl18xx_siso20_ht_cap);
-               wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ,
+               wlcore_set_ht_cap(wl, NL80211_BAND_5GHZ,
                                  &wl18xx_siso20_ht_cap);
        }