cfg80211: remove enum ieee80211_band

[cascardo/linux.git] / drivers / net / wireless / ath / ath6kl / wmi.c

diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index 0b3e9c0..631c3a0 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -2048,7 +2048,7 @@ int ath6kl_wmi_beginscan_cmd(struct wmi *wmi, u8 if_idx,
        sc->no_cck = cpu_to_le32(no_cck);
        sc->num_ch = num_chan;
 
-       for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+       for (band = 0; band < NUM_NL80211_BANDS; band++) {
                sband = ar->wiphy->bands[band];
 
                if (!sband)
@@ -2770,10 +2770,10 @@ static int ath6kl_set_bitrate_mask64(struct wmi *wmi, u8 if_idx,
        memset(&ratemask, 0, sizeof(ratemask));
 
        /* only check 2.4 and 5 GHz bands, skip the rest */
-       for (band = 0; band <= IEEE80211_BAND_5GHZ; band++) {
+       for (band = 0; band <= NL80211_BAND_5GHZ; band++) {
                /* copy legacy rate mask */
                ratemask[band] = mask->control[band].legacy;
-               if (band == IEEE80211_BAND_5GHZ)
+               if (band == NL80211_BAND_5GHZ)
                        ratemask[band] =
                                mask->control[band].legacy << 4;
 
@@ -2799,9 +2799,9 @@ static int ath6kl_set_bitrate_mask64(struct wmi *wmi, u8 if_idx,
                if (mode == WMI_RATES_MODE_11A ||
                    mode == WMI_RATES_MODE_11A_HT20 ||
                    mode == WMI_RATES_MODE_11A_HT40)
-                       band = IEEE80211_BAND_5GHZ;
+                       band = NL80211_BAND_5GHZ;
                else
-                       band = IEEE80211_BAND_2GHZ;
+                       band = NL80211_BAND_2GHZ;
                cmd->ratemask[mode] = cpu_to_le64(ratemask[band]);
        }
 
@@ -2822,10 +2822,10 @@ static int ath6kl_set_bitrate_mask32(struct wmi *wmi, u8 if_idx,
        memset(&ratemask, 0, sizeof(ratemask));
 
        /* only check 2.4 and 5 GHz bands, skip the rest */
-       for (band = 0; band <= IEEE80211_BAND_5GHZ; band++) {
+       for (band = 0; band <= NL80211_BAND_5GHZ; band++) {
                /* copy legacy rate mask */
                ratemask[band] = mask->control[band].legacy;
-               if (band == IEEE80211_BAND_5GHZ)
+               if (band == NL80211_BAND_5GHZ)
                        ratemask[band] =
                                mask->control[band].legacy << 4;
 
@@ -2849,9 +2849,9 @@ static int ath6kl_set_bitrate_mask32(struct wmi *wmi, u8 if_idx,
                if (mode == WMI_RATES_MODE_11A ||
                    mode == WMI_RATES_MODE_11A_HT20 ||
                    mode == WMI_RATES_MODE_11A_HT40)
-                       band = IEEE80211_BAND_5GHZ;
+                       band = NL80211_BAND_5GHZ;
                else
-                       band = IEEE80211_BAND_2GHZ;
+                       band = NL80211_BAND_2GHZ;
                cmd->ratemask[mode] = cpu_to_le32(ratemask[band]);
        }
 
@@ -3174,7 +3174,7 @@ int ath6kl_wmi_set_keepalive_cmd(struct wmi *wmi, u8 if_idx,
 }
 
 int ath6kl_wmi_set_htcap_cmd(struct wmi *wmi, u8 if_idx,
-                            enum ieee80211_band band,
+                            enum nl80211_band band,
                             struct ath6kl_htcap *htcap)
 {
        struct sk_buff *skb;
@@ -3187,7 +3187,7 @@ int ath6kl_wmi_set_htcap_cmd(struct wmi *wmi, u8 if_idx,
        cmd = (struct wmi_set_htcap_cmd *) skb->data;
 
        /*
-        * NOTE: Band in firmware matches enum ieee80211_band, it is unlikely
+        * NOTE: Band in firmware matches enum nl80211_band, it is unlikely
         * this will be changed in firmware. If at all there is any change in
         * band value, the host needs to be fixed.
         */