cfg80211: remove enum ieee80211_band

[cascardo/linux.git] / drivers / net / wireless / ti / wlcore / scan.c

diff --git a/drivers/net/wireless/ti/wlcore/scan.c b/drivers/net/wireless/ti/wlcore/scan.c
index a384f3f..2334364 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/scan.c
+++ b/drivers/net/wireless/ti/wlcore/scan.c
@@ -164,7 +164,7 @@ wlcore_scan_get_channels(struct wl1271 *wl,
                struct conf_sched_scan_settings *c = &wl->conf.sched_scan;
                u32 delta_per_probe;
 
-               if (band == IEEE80211_BAND_5GHZ)
+               if (band == NL80211_BAND_5GHZ)
                        delta_per_probe = c->dwell_time_delta_per_probe_5;
                else
                        delta_per_probe = c->dwell_time_delta_per_probe;
@@ -215,7 +215,7 @@ wlcore_scan_get_channels(struct wl1271 *wl,
                        channels[j].channel = req_channels[i]->hw_value;
 
                        if (n_pactive_ch &&
-                           (band == IEEE80211_BAND_2GHZ) &&
+                           (band == NL80211_BAND_2GHZ) &&
                            (channels[j].channel >= 12) &&
                            (channels[j].channel <= 14) &&
                            (flags & IEEE80211_CHAN_NO_IR) &&
@@ -266,7 +266,7 @@ wlcore_set_scan_chan_params(struct wl1271 *wl,
                                         n_channels,
                                         n_ssids,
                                         cfg->channels_2,
-                                        IEEE80211_BAND_2GHZ,
+                                        NL80211_BAND_2GHZ,
                                         false, true, 0,
                                         MAX_CHANNELS_2GHZ,
                                         &n_pactive_ch,
@@ -277,7 +277,7 @@ wlcore_set_scan_chan_params(struct wl1271 *wl,
                                         n_channels,
                                         n_ssids,
                                         cfg->channels_2,
-                                        IEEE80211_BAND_2GHZ,
+                                        NL80211_BAND_2GHZ,
                                         false, false,
                                         cfg->passive[0],
                                         MAX_CHANNELS_2GHZ,
@@ -289,7 +289,7 @@ wlcore_set_scan_chan_params(struct wl1271 *wl,
                                         n_channels,
                                         n_ssids,
                                         cfg->channels_5,
-                                        IEEE80211_BAND_5GHZ,
+                                        NL80211_BAND_5GHZ,
                                         false, true, 0,
                                         wl->max_channels_5,
                                         &n_pactive_ch,
@@ -300,7 +300,7 @@ wlcore_set_scan_chan_params(struct wl1271 *wl,
                                         n_channels,
                                         n_ssids,
                                         cfg->channels_5,
-                                        IEEE80211_BAND_5GHZ,
+                                        NL80211_BAND_5GHZ,
                                         true, true,
                                         cfg->passive[1],
                                         wl->max_channels_5,
@@ -312,7 +312,7 @@ wlcore_set_scan_chan_params(struct wl1271 *wl,
                                         n_channels,
                                         n_ssids,
                                         cfg->channels_5,
-                                        IEEE80211_BAND_5GHZ,
+                                        NL80211_BAND_5GHZ,
                                         false, false,
                                         cfg->passive[1] + cfg->dfs,
                                         wl->max_channels_5,