aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/wext-compat.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/wireless/wext-compat.c')
-rw-r--r--net/wireless/wext-compat.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index fd682832a0e3..4c89f0ca61ba 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -32,13 +32,13 @@ int cfg80211_wext_giwname(struct net_device *dev,
32 if (!wdev) 32 if (!wdev)
33 return -EOPNOTSUPP; 33 return -EOPNOTSUPP;
34 34
35 sband = wdev->wiphy->bands[IEEE80211_BAND_5GHZ]; 35 sband = wdev->wiphy->bands[NL80211_BAND_5GHZ];
36 if (sband) { 36 if (sband) {
37 is_a = true; 37 is_a = true;
38 is_ht |= sband->ht_cap.ht_supported; 38 is_ht |= sband->ht_cap.ht_supported;
39 } 39 }
40 40
41 sband = wdev->wiphy->bands[IEEE80211_BAND_2GHZ]; 41 sband = wdev->wiphy->bands[NL80211_BAND_2GHZ];
42 if (sband) { 42 if (sband) {
43 int i; 43 int i;
44 /* Check for mandatory rates */ 44 /* Check for mandatory rates */
@@ -143,7 +143,7 @@ int cfg80211_wext_giwrange(struct net_device *dev,
143{ 143{
144 struct wireless_dev *wdev = dev->ieee80211_ptr; 144 struct wireless_dev *wdev = dev->ieee80211_ptr;
145 struct iw_range *range = (struct iw_range *) extra; 145 struct iw_range *range = (struct iw_range *) extra;
146 enum ieee80211_band band; 146 enum nl80211_band band;
147 int i, c = 0; 147 int i, c = 0;
148 148
149 if (!wdev) 149 if (!wdev)
@@ -215,7 +215,7 @@ int cfg80211_wext_giwrange(struct net_device *dev,
215 } 215 }
216 } 216 }
217 217
218 for (band = 0; band < IEEE80211_NUM_BANDS; band ++) { 218 for (band = 0; band < NUM_NL80211_BANDS; band ++) {
219 struct ieee80211_supported_band *sband; 219 struct ieee80211_supported_band *sband;
220 220
221 sband = wdev->wiphy->bands[band]; 221 sband = wdev->wiphy->bands[band];
@@ -265,11 +265,11 @@ int cfg80211_wext_freq(struct iw_freq *freq)
265 * -EINVAL for impossible things. 265 * -EINVAL for impossible things.
266 */ 266 */
267 if (freq->e == 0) { 267 if (freq->e == 0) {
268 enum ieee80211_band band = IEEE80211_BAND_2GHZ; 268 enum nl80211_band band = NL80211_BAND_2GHZ;
269 if (freq->m < 0) 269 if (freq->m < 0)
270 return 0; 270 return 0;
271 if (freq->m > 14) 271 if (freq->m > 14)
272 band = IEEE80211_BAND_5GHZ; 272 band = NL80211_BAND_5GHZ;
273 return ieee80211_channel_to_frequency(freq->m, band); 273 return ieee80211_channel_to_frequency(freq->m, band);
274 } else { 274 } else {
275 int i, div = 1000000; 275 int i, div = 1000000;
@@ -1245,7 +1245,7 @@ static int cfg80211_wext_siwrate(struct net_device *dev,
1245 maxrate = rate->value / 100000; 1245 maxrate = rate->value / 100000;
1246 } 1246 }
1247 1247
1248 for (band = 0; band < IEEE80211_NUM_BANDS; band++) { 1248 for (band = 0; band < NUM_NL80211_BANDS; band++) {
1249 sband = wdev->wiphy->bands[band]; 1249 sband = wdev->wiphy->bands[band];
1250 if (sband == NULL) 1250 if (sband == NULL)
1251 continue; 1251 continue;