projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cfg80211: remove enum ieee80211_band
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
ath
/
ath10k
/
wmi.c
diff --git
a/drivers/net/wireless/ath/ath10k/wmi.c
b/drivers/net/wireless/ath/ath10k/wmi.c
index
f7ec65f
..
4c75c74
100644
(file)
--- a/
drivers/net/wireless/ath/ath10k/wmi.c
+++ b/
drivers/net/wireless/ath/ath10k/wmi.c
@@
-2281,9
+2281,9
@@
int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
* of mgmt rx.
*/
if (channel >= 1 && channel <= 14) {
* of mgmt rx.
*/
if (channel >= 1 && channel <= 14) {
- status->band =
IEEE
80211_BAND_2GHZ;
+ status->band =
NL
80211_BAND_2GHZ;
} else if (channel >= 36 && channel <= 165) {
} else if (channel >= 36 && channel <= 165) {
- status->band =
IEEE
80211_BAND_5GHZ;
+ status->band =
NL
80211_BAND_5GHZ;
} else {
/* Shouldn't happen unless list of advertised channels to
* mac80211 has been changed.
} else {
/* Shouldn't happen unless list of advertised channels to
* mac80211 has been changed.
@@
-2293,7
+2293,7
@@
int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
return 0;
}
return 0;
}
- if (phy_mode == MODE_11B && status->band ==
IEEE
80211_BAND_5GHZ)
+ if (phy_mode == MODE_11B && status->band ==
NL
80211_BAND_5GHZ)
ath10k_dbg(ar, ATH10K_DBG_MGMT, "wmi mgmt rx 11b (CCK) on 5GHz\n");
sband = &ar->mac.sbands[status->band];
ath10k_dbg(ar, ATH10K_DBG_MGMT, "wmi mgmt rx 11b (CCK) on 5GHz\n");
sband = &ar->mac.sbands[status->band];
@@
-2352,7
+2352,7
@@
static int freq_to_idx(struct ath10k *ar, int freq)
struct ieee80211_supported_band *sband;
int band, ch, idx = 0;
struct ieee80211_supported_band *sband;
int band, ch, idx = 0;
- for (band =
IEEE80211_BAND_2GHZ; band < IEEE80211_NUM
_BANDS; band++) {
+ for (band =
NL80211_BAND_2GHZ; band < NUM_NL80211
_BANDS; band++) {
sband = ar->hw->wiphy->bands[band];
if (!sband)
continue;
sband = ar->hw->wiphy->bands[band];
if (!sband)
continue;