diff options
Diffstat (limited to 'net/wireless/core.c')
-rw-r--r-- | net/wireless/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 5327e4b974fa..7f7b9409bf4c 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c | |||
@@ -557,7 +557,7 @@ int wiphy_register(struct wiphy *wiphy) | |||
557 | { | 557 | { |
558 | struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); | 558 | struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); |
559 | int res; | 559 | int res; |
560 | enum ieee80211_band band; | 560 | enum nl80211_band band; |
561 | struct ieee80211_supported_band *sband; | 561 | struct ieee80211_supported_band *sband; |
562 | bool have_band = false; | 562 | bool have_band = false; |
563 | int i; | 563 | int i; |
@@ -647,7 +647,7 @@ int wiphy_register(struct wiphy *wiphy) | |||
647 | return res; | 647 | return res; |
648 | 648 | ||
649 | /* sanity check supported bands/channels */ | 649 | /* sanity check supported bands/channels */ |
650 | for (band = 0; band < IEEE80211_NUM_BANDS; band++) { | 650 | for (band = 0; band < NUM_NL80211_BANDS; band++) { |
651 | sband = wiphy->bands[band]; | 651 | sband = wiphy->bands[band]; |
652 | if (!sband) | 652 | if (!sband) |
653 | continue; | 653 | continue; |
@@ -659,7 +659,7 @@ int wiphy_register(struct wiphy *wiphy) | |||
659 | * on 60GHz band, there are no legacy rates, so | 659 | * on 60GHz band, there are no legacy rates, so |
660 | * n_bitrates is 0 | 660 | * n_bitrates is 0 |
661 | */ | 661 | */ |
662 | if (WARN_ON(band != IEEE80211_BAND_60GHZ && | 662 | if (WARN_ON(band != NL80211_BAND_60GHZ && |
663 | !sband->n_bitrates)) | 663 | !sband->n_bitrates)) |
664 | return -EINVAL; | 664 | return -EINVAL; |
665 | 665 | ||
@@ -669,7 +669,7 @@ int wiphy_register(struct wiphy *wiphy) | |||
669 | * global structure for that. | 669 | * global structure for that. |
670 | */ | 670 | */ |
671 | if (cfg80211_disable_40mhz_24ghz && | 671 | if (cfg80211_disable_40mhz_24ghz && |
672 | band == IEEE80211_BAND_2GHZ && | 672 | band == NL80211_BAND_2GHZ && |
673 | sband->ht_cap.ht_supported) { | 673 | sband->ht_cap.ht_supported) { |
674 | sband->ht_cap.cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; | 674 | sband->ht_cap.cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40; |
675 | sband->ht_cap.cap &= ~IEEE80211_HT_CAP_SGI_40; | 675 | sband->ht_cap.cap &= ~IEEE80211_HT_CAP_SGI_40; |