diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/common-init.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/common-init.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/wireless/ath/ath9k/common-init.c b/drivers/net/wireless/ath/ath9k/common-init.c index a006c1499728..8b4f7fdabf58 100644 --- a/drivers/net/wireless/ath/ath9k/common-init.c +++ b/drivers/net/wireless/ath/ath9k/common-init.c | |||
@@ -19,14 +19,14 @@ | |||
19 | #include "common.h" | 19 | #include "common.h" |
20 | 20 | ||
21 | #define CHAN2G(_freq, _idx) { \ | 21 | #define CHAN2G(_freq, _idx) { \ |
22 | .band = IEEE80211_BAND_2GHZ, \ | 22 | .band = NL80211_BAND_2GHZ, \ |
23 | .center_freq = (_freq), \ | 23 | .center_freq = (_freq), \ |
24 | .hw_value = (_idx), \ | 24 | .hw_value = (_idx), \ |
25 | .max_power = 20, \ | 25 | .max_power = 20, \ |
26 | } | 26 | } |
27 | 27 | ||
28 | #define CHAN5G(_freq, _idx) { \ | 28 | #define CHAN5G(_freq, _idx) { \ |
29 | .band = IEEE80211_BAND_5GHZ, \ | 29 | .band = NL80211_BAND_5GHZ, \ |
30 | .center_freq = (_freq), \ | 30 | .center_freq = (_freq), \ |
31 | .hw_value = (_idx), \ | 31 | .hw_value = (_idx), \ |
32 | .max_power = 20, \ | 32 | .max_power = 20, \ |
@@ -139,12 +139,12 @@ int ath9k_cmn_init_channels_rates(struct ath_common *common) | |||
139 | 139 | ||
140 | memcpy(channels, ath9k_2ghz_chantable, | 140 | memcpy(channels, ath9k_2ghz_chantable, |
141 | sizeof(ath9k_2ghz_chantable)); | 141 | sizeof(ath9k_2ghz_chantable)); |
142 | common->sbands[IEEE80211_BAND_2GHZ].channels = channels; | 142 | common->sbands[NL80211_BAND_2GHZ].channels = channels; |
143 | common->sbands[IEEE80211_BAND_2GHZ].band = IEEE80211_BAND_2GHZ; | 143 | common->sbands[NL80211_BAND_2GHZ].band = NL80211_BAND_2GHZ; |
144 | common->sbands[IEEE80211_BAND_2GHZ].n_channels = | 144 | common->sbands[NL80211_BAND_2GHZ].n_channels = |
145 | ARRAY_SIZE(ath9k_2ghz_chantable); | 145 | ARRAY_SIZE(ath9k_2ghz_chantable); |
146 | common->sbands[IEEE80211_BAND_2GHZ].bitrates = ath9k_legacy_rates; | 146 | common->sbands[NL80211_BAND_2GHZ].bitrates = ath9k_legacy_rates; |
147 | common->sbands[IEEE80211_BAND_2GHZ].n_bitrates = | 147 | common->sbands[NL80211_BAND_2GHZ].n_bitrates = |
148 | ARRAY_SIZE(ath9k_legacy_rates); | 148 | ARRAY_SIZE(ath9k_legacy_rates); |
149 | } | 149 | } |
150 | 150 | ||
@@ -156,13 +156,13 @@ int ath9k_cmn_init_channels_rates(struct ath_common *common) | |||
156 | 156 | ||
157 | memcpy(channels, ath9k_5ghz_chantable, | 157 | memcpy(channels, ath9k_5ghz_chantable, |
158 | sizeof(ath9k_5ghz_chantable)); | 158 | sizeof(ath9k_5ghz_chantable)); |
159 | common->sbands[IEEE80211_BAND_5GHZ].channels = channels; | 159 | common->sbands[NL80211_BAND_5GHZ].channels = channels; |
160 | common->sbands[IEEE80211_BAND_5GHZ].band = IEEE80211_BAND_5GHZ; | 160 | common->sbands[NL80211_BAND_5GHZ].band = NL80211_BAND_5GHZ; |
161 | common->sbands[IEEE80211_BAND_5GHZ].n_channels = | 161 | common->sbands[NL80211_BAND_5GHZ].n_channels = |
162 | ARRAY_SIZE(ath9k_5ghz_chantable); | 162 | ARRAY_SIZE(ath9k_5ghz_chantable); |
163 | common->sbands[IEEE80211_BAND_5GHZ].bitrates = | 163 | common->sbands[NL80211_BAND_5GHZ].bitrates = |
164 | ath9k_legacy_rates + 4; | 164 | ath9k_legacy_rates + 4; |
165 | common->sbands[IEEE80211_BAND_5GHZ].n_bitrates = | 165 | common->sbands[NL80211_BAND_5GHZ].n_bitrates = |
166 | ARRAY_SIZE(ath9k_legacy_rates) - 4; | 166 | ARRAY_SIZE(ath9k_legacy_rates) - 4; |
167 | } | 167 | } |
168 | return 0; | 168 | return 0; |
@@ -236,9 +236,9 @@ void ath9k_cmn_reload_chainmask(struct ath_hw *ah) | |||
236 | 236 | ||
237 | if (ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ) | 237 | if (ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ) |
238 | ath9k_cmn_setup_ht_cap(ah, | 238 | ath9k_cmn_setup_ht_cap(ah, |
239 | &common->sbands[IEEE80211_BAND_2GHZ].ht_cap); | 239 | &common->sbands[NL80211_BAND_2GHZ].ht_cap); |
240 | if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ) | 240 | if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ) |
241 | ath9k_cmn_setup_ht_cap(ah, | 241 | ath9k_cmn_setup_ht_cap(ah, |
242 | &common->sbands[IEEE80211_BAND_5GHZ].ht_cap); | 242 | &common->sbands[NL80211_BAND_5GHZ].ht_cap); |
243 | } | 243 | } |
244 | EXPORT_SYMBOL(ath9k_cmn_reload_chainmask); | 244 | EXPORT_SYMBOL(ath9k_cmn_reload_chainmask); |