evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "cfg80211: remove enum ieee80211_band""

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-28 00:47:15 -08:00 • committed by Gerrit - the friendly Code Review server
commit 6424e947b1
3 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/ath/ath10k/core.h
View file

@ -781,7 +781,7 @@ struct ath10k {
} scan; } scan;
struct { struct {
struct ieee80211_supported_band sbands[NUM_NL80211_BANDS]; struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
} mac; } mac;
/* should never be NULL; needed for regular htt rx */ /* should never be NULL; needed for regular htt rx */

68
drivers/net/wireless/ath/ath10k/mac.c
View file

@ -531,7 +531,7 @@ chan_to_phymode(const struct cfg80211_chan_def *chandef)
enum wmi_phy_mode phymode = MODE_UNKNOWN; enum wmi_phy_mode phymode = MODE_UNKNOWN;
switch (chandef->chan->band) { switch (chandef->chan->band) {
case NL80211_BAND_2GHZ: case IEEE80211_BAND_2GHZ:
switch (chandef->width) { switch (chandef->width) {
case NL80211_CHAN_WIDTH_20_NOHT: case NL80211_CHAN_WIDTH_20_NOHT:
if (chandef->chan->flags & IEEE80211_CHAN_NO_OFDM) if (chandef->chan->flags & IEEE80211_CHAN_NO_OFDM)
@ -554,7 +554,7 @@ chan_to_phymode(const struct cfg80211_chan_def *chandef)
break; break;
} }
break; break;
case NL80211_BAND_5GHZ: case IEEE80211_BAND_5GHZ:
switch (chandef->width) { switch (chandef->width) {
case NL80211_CHAN_WIDTH_20_NOHT: case NL80211_CHAN_WIDTH_20_NOHT:
phymode = MODE_11A; phymode = MODE_11A;
@ -2122,7 +2122,7 @@ static void ath10k_peer_assoc_h_rates(struct ath10k *ar,
struct cfg80211_chan_def def; struct cfg80211_chan_def def;
const struct ieee80211_supported_band *sband; const struct ieee80211_supported_band *sband;
const struct ieee80211_rate *rates; const struct ieee80211_rate *rates;
enum nl80211_band band; enum ieee80211_band band;
u32 ratemask; u32 ratemask;
u8 rate; u8 rate;
int i; int i;
@ -2182,7 +2182,7 @@ static void ath10k_peer_assoc_h_ht(struct ath10k *ar,
const struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap; const struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif); struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
struct cfg80211_chan_def def; struct cfg80211_chan_def def;
enum nl80211_band band; enum ieee80211_band band;
const u8 *ht_mcs_mask; const u8 *ht_mcs_mask;
const u16 *vht_mcs_mask; const u16 *vht_mcs_mask;
int i, n; int i, n;
@ -2406,7 +2406,7 @@ static void ath10k_peer_assoc_h_vht(struct ath10k *ar,
const struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap; const struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap;
struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif); struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
struct cfg80211_chan_def def; struct cfg80211_chan_def def;
enum nl80211_band band; enum ieee80211_band band;
const u16 *vht_mcs_mask; const u16 *vht_mcs_mask;
u8 ampdu_factor; u8 ampdu_factor;
@ -2424,7 +2424,7 @@ static void ath10k_peer_assoc_h_vht(struct ath10k *ar,
arg->peer_flags |= ar->wmi.peer_flags->vht; arg->peer_flags |= ar->wmi.peer_flags->vht;
if (def.chan->band == NL80211_BAND_2GHZ) if (def.chan->band == IEEE80211_BAND_2GHZ)
arg->peer_flags |= ar->wmi.peer_flags->vht_2g; arg->peer_flags |= ar->wmi.peer_flags->vht_2g;
arg->peer_vht_caps = vht_cap->cap; arg->peer_vht_caps = vht_cap->cap;
@ -2493,7 +2493,7 @@ static void ath10k_peer_assoc_h_qos(struct ath10k *ar,
static bool ath10k_mac_sta_has_ofdm_only(struct ieee80211_sta *sta) static bool ath10k_mac_sta_has_ofdm_only(struct ieee80211_sta *sta)
{ {
return sta->supp_rates[NL80211_BAND_2GHZ] >> return sta->supp_rates[IEEE80211_BAND_2GHZ] >>
ATH10K_MAC_FIRST_OFDM_RATE_IDX; ATH10K_MAC_FIRST_OFDM_RATE_IDX;
} }
@ -2504,7 +2504,7 @@ static void ath10k_peer_assoc_h_phymode(struct ath10k *ar,
{ {
struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif); struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
struct cfg80211_chan_def def; struct cfg80211_chan_def def;
enum nl80211_band band; enum ieee80211_band band;
const u8 *ht_mcs_mask; const u8 *ht_mcs_mask;
const u16 *vht_mcs_mask; const u16 *vht_mcs_mask;
enum wmi_phy_mode phymode = MODE_UNKNOWN; enum wmi_phy_mode phymode = MODE_UNKNOWN;
@ -2517,7 +2517,7 @@ static void ath10k_peer_assoc_h_phymode(struct ath10k *ar,
vht_mcs_mask = arvif->bitrate_mask.control[band].vht_mcs; vht_mcs_mask = arvif->bitrate_mask.control[band].vht_mcs;
switch (band) { switch (band) {
case NL80211_BAND_2GHZ: case IEEE80211_BAND_2GHZ:
if (sta->vht_cap.vht_supported && if (sta->vht_cap.vht_supported &&
!ath10k_peer_assoc_h_vht_masked(vht_mcs_mask)) { !ath10k_peer_assoc_h_vht_masked(vht_mcs_mask)) {
if (sta->bandwidth == IEEE80211_STA_RX_BW_40) if (sta->bandwidth == IEEE80211_STA_RX_BW_40)
@ -2537,7 +2537,7 @@ static void ath10k_peer_assoc_h_phymode(struct ath10k *ar,
} }
break; break;
case NL80211_BAND_5GHZ: case IEEE80211_BAND_5GHZ:
/* /*
* Check VHT first. * Check VHT first.
*/ */
@ -2915,7 +2915,7 @@ static int ath10k_update_channel_list(struct ath10k *ar)
{ {
struct ieee80211_hw *hw = ar->hw; struct ieee80211_hw *hw = ar->hw;
struct ieee80211_supported_band **bands; struct ieee80211_supported_band **bands;
enum nl80211_band band; enum ieee80211_band band;
struct ieee80211_channel *channel; struct ieee80211_channel *channel;
struct wmi_scan_chan_list_arg arg = {0}; struct wmi_scan_chan_list_arg arg = {0};
struct wmi_channel_arg *ch; struct wmi_channel_arg *ch;
@ -2927,7 +2927,7 @@ static int ath10k_update_channel_list(struct ath10k *ar)
lockdep_assert_held(&ar->conf_mutex); lockdep_assert_held(&ar->conf_mutex);
bands = hw->wiphy->bands; bands = hw->wiphy->bands;
for (band = 0; band < NUM_NL80211_BANDS; band++) { for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
if (!bands[band]) if (!bands[band])
continue; continue;
@ -2946,7 +2946,7 @@ static int ath10k_update_channel_list(struct ath10k *ar)
return -ENOMEM; return -ENOMEM;
ch = arg.channels; ch = arg.channels;
for (band = 0; band < NUM_NL80211_BANDS; band++) { for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
if (!bands[band]) if (!bands[band])
continue; continue;
@ -2984,7 +2984,7 @@ static int ath10k_update_channel_list(struct ath10k *ar)
/* FIXME: why use only legacy modes, why not any /* FIXME: why use only legacy modes, why not any
* HT/VHT modes? Would that even make any * HT/VHT modes? Would that even make any
* difference? */ * difference? */
if (channel->band == NL80211_BAND_2GHZ) if (channel->band == IEEE80211_BAND_2GHZ)
ch->mode = MODE_11G; ch->mode = MODE_11G;
else else
ch->mode = MODE_11A; ch->mode = MODE_11A;
@ -4370,11 +4370,11 @@ static void ath10k_mac_setup_ht_vht_cap(struct ath10k *ar)
vht_cap = ath10k_create_vht_cap(ar); vht_cap = ath10k_create_vht_cap(ar);
if (ar->phy_capability & WHAL_WLAN_11G_CAPABILITY) { if (ar->phy_capability & WHAL_WLAN_11G_CAPABILITY) {
band = &ar->mac.sbands[NL80211_BAND_2GHZ]; band = &ar->mac.sbands[IEEE80211_BAND_2GHZ];
band->ht_cap = ht_cap; band->ht_cap = ht_cap;
} }
if (ar->phy_capability & WHAL_WLAN_11A_CAPABILITY) { if (ar->phy_capability & WHAL_WLAN_11A_CAPABILITY) {
band = &ar->mac.sbands[NL80211_BAND_5GHZ]; band = &ar->mac.sbands[IEEE80211_BAND_5GHZ];
band->ht_cap = ht_cap; band->ht_cap = ht_cap;
band->vht_cap = vht_cap; band->vht_cap = vht_cap;
} }
@ -5722,7 +5722,7 @@ static void ath10k_sta_rc_update_wk(struct work_struct *wk)
struct ath10k_sta *arsta; struct ath10k_sta *arsta;
struct ieee80211_sta *sta; struct ieee80211_sta *sta;
struct cfg80211_chan_def def; struct cfg80211_chan_def def;
enum nl80211_band band; enum ieee80211_band band;
const u8 *ht_mcs_mask; const u8 *ht_mcs_mask;
const u16 *vht_mcs_mask; const u16 *vht_mcs_mask;
u32 changed, bw, nss, smps; u32 changed, bw, nss, smps;
@ -6562,14 +6562,14 @@ static int ath10k_get_survey(struct ieee80211_hw *hw, int idx,
mutex_lock(&ar->conf_mutex); mutex_lock(&ar->conf_mutex);
sband = hw->wiphy->bands[NL80211_BAND_2GHZ]; sband = hw->wiphy->bands[IEEE80211_BAND_2GHZ];
if (sband && idx >= sband->n_channels) { if (sband && idx >= sband->n_channels) {
idx -= sband->n_channels; idx -= sband->n_channels;
sband = NULL; sband = NULL;
} }
if (!sband) if (!sband)
sband = hw->wiphy->bands[NL80211_BAND_5GHZ]; sband = hw->wiphy->bands[IEEE80211_BAND_5GHZ];
if (!sband || idx >= sband->n_channels) { if (!sband || idx >= sband->n_channels) {
ret = -ENOENT; ret = -ENOENT;
@ -6594,7 +6594,7 @@ exit:
static bool static bool
ath10k_mac_bitrate_mask_has_single_rate(struct ath10k *ar, ath10k_mac_bitrate_mask_has_single_rate(struct ath10k *ar,
enum nl80211_band band, enum ieee80211_band band,
const struct cfg80211_bitrate_mask *mask) const struct cfg80211_bitrate_mask *mask)
{ {
int num_rates = 0; int num_rates = 0;
@ -6613,7 +6613,7 @@ ath10k_mac_bitrate_mask_has_single_rate(struct ath10k *ar,
static bool static bool
ath10k_mac_bitrate_mask_get_single_nss(struct ath10k *ar, ath10k_mac_bitrate_mask_get_single_nss(struct ath10k *ar,
enum nl80211_band band, enum ieee80211_band band,
const struct cfg80211_bitrate_mask *mask, const struct cfg80211_bitrate_mask *mask,
int *nss) int *nss)
{ {
@ -6662,7 +6662,7 @@ ath10k_mac_bitrate_mask_get_single_nss(struct ath10k *ar,
static int static int
ath10k_mac_bitrate_mask_get_single_rate(struct ath10k *ar, ath10k_mac_bitrate_mask_get_single_rate(struct ath10k *ar,
enum nl80211_band band, enum ieee80211_band band,
const struct cfg80211_bitrate_mask *mask, const struct cfg80211_bitrate_mask *mask,
u8 *rate, u8 *nss) u8 *rate, u8 *nss)
{ {
@ -6763,7 +6763,7 @@ static int ath10k_mac_set_fixed_rate_params(struct ath10k_vif *arvif,
static bool static bool
ath10k_mac_can_set_bitrate_mask(struct ath10k *ar, ath10k_mac_can_set_bitrate_mask(struct ath10k *ar,
enum nl80211_band band, enum ieee80211_band band,
const struct cfg80211_bitrate_mask *mask) const struct cfg80211_bitrate_mask *mask)
{ {
int i; int i;
@ -6815,7 +6815,7 @@ static int ath10k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw,
struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif); struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
struct cfg80211_chan_def def; struct cfg80211_chan_def def;
struct ath10k *ar = arvif->ar; struct ath10k *ar = arvif->ar;
enum nl80211_band band; enum ieee80211_band band;
const u8 *ht_mcs_mask; const u8 *ht_mcs_mask;
const u16 *vht_mcs_mask; const u16 *vht_mcs_mask;
u8 rate; u8 rate;
@ -7479,7 +7479,7 @@ static const struct ieee80211_ops ath10k_ops = {
}; };
#define CHAN2G(_channel, _freq, _flags) { \ #define CHAN2G(_channel, _freq, _flags) { \
.band = NL80211_BAND_2GHZ, \ .band = IEEE80211_BAND_2GHZ, \
.hw_value = (_channel), \ .hw_value = (_channel), \
.center_freq = (_freq), \ .center_freq = (_freq), \
.flags = (_flags), \ .flags = (_flags), \
@ -7488,7 +7488,7 @@ static const struct ieee80211_ops ath10k_ops = {
} }
#define CHAN5G(_channel, _freq, _flags) { \ #define CHAN5G(_channel, _freq, _flags) { \
.band = NL80211_BAND_5GHZ, \ .band = IEEE80211_BAND_5GHZ, \
.hw_value = (_channel), \ .hw_value = (_channel), \
.center_freq = (_freq), \ .center_freq = (_freq), \
.flags = (_flags), \ .flags = (_flags), \
@ -7819,7 +7819,7 @@ int ath10k_mac_register(struct ath10k *ar)
goto err_free; goto err_free;
} }
band = &ar->mac.sbands[NL80211_BAND_2GHZ]; band = &ar->mac.sbands[IEEE80211_BAND_2GHZ];
band->n_channels = ARRAY_SIZE(ath10k_2ghz_channels); band->n_channels = ARRAY_SIZE(ath10k_2ghz_channels);
band->channels = channels; band->channels = channels;
@ -7831,7 +7831,7 @@ int ath10k_mac_register(struct ath10k *ar)
band->bitrates = ath10k_g_rates; band->bitrates = ath10k_g_rates;
} }
ar->hw->wiphy->bands[NL80211_BAND_2GHZ] = band; ar->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = band;
} }
if (ar->phy_capability & WHAL_WLAN_11A_CAPABILITY) { if (ar->phy_capability & WHAL_WLAN_11A_CAPABILITY) {
@ -7843,12 +7843,12 @@ int ath10k_mac_register(struct ath10k *ar)
goto err_free; goto err_free;
} }
band = &ar->mac.sbands[NL80211_BAND_5GHZ]; band = &ar->mac.sbands[IEEE80211_BAND_5GHZ];
band->n_channels = ARRAY_SIZE(ath10k_5ghz_channels); band->n_channels = ARRAY_SIZE(ath10k_5ghz_channels);
band->channels = channels; band->channels = channels;
band->n_bitrates = ath10k_a_rates_size; band->n_bitrates = ath10k_a_rates_size;
band->bitrates = ath10k_a_rates; band->bitrates = ath10k_a_rates;
ar->hw->wiphy->bands[NL80211_BAND_5GHZ] = band; ar->hw->wiphy->bands[IEEE80211_BAND_5GHZ] = band;
} }
ath10k_mac_setup_ht_vht_cap(ar); ath10k_mac_setup_ht_vht_cap(ar);
@ -8045,8 +8045,8 @@ err_dfs_detector_exit:
ar->dfs_detector->exit(ar->dfs_detector); ar->dfs_detector->exit(ar->dfs_detector);
err_free: err_free:
kfree(ar->mac.sbands[NL80211_BAND_2GHZ].channels); kfree(ar->mac.sbands[IEEE80211_BAND_2GHZ].channels);
kfree(ar->mac.sbands[NL80211_BAND_5GHZ].channels); kfree(ar->mac.sbands[IEEE80211_BAND_5GHZ].channels);
SET_IEEE80211_DEV(ar->hw, NULL); SET_IEEE80211_DEV(ar->hw, NULL);
return ret; return ret;
@ -8059,8 +8059,8 @@ void ath10k_mac_unregister(struct ath10k *ar)
if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector) if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector)
ar->dfs_detector->exit(ar->dfs_detector); ar->dfs_detector->exit(ar->dfs_detector);
kfree(ar->mac.sbands[NL80211_BAND_2GHZ].channels); kfree(ar->mac.sbands[IEEE80211_BAND_2GHZ].channels);
kfree(ar->mac.sbands[NL80211_BAND_5GHZ].channels); kfree(ar->mac.sbands[IEEE80211_BAND_5GHZ].channels);
SET_IEEE80211_DEV(ar->hw, NULL); SET_IEEE80211_DEV(ar->hw, NULL);
} }

8
drivers/net/wireless/ath/ath10k/wmi.c
View file

@ -2320,9 +2320,9 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
* of mgmt rx. * of mgmt rx.
*/ */
if (channel >= 1 && channel <= 14) { if (channel >= 1 && channel <= 14) {
status->band = NL80211_BAND_2GHZ; status->band = IEEE80211_BAND_2GHZ;
} else if (channel >= 36 && channel <= 165) { } else if (channel >= 36 && channel <= 165) {
status->band = NL80211_BAND_5GHZ; status->band = IEEE80211_BAND_5GHZ;
} else { } else {
/* Shouldn't happen unless list of advertised channels to /* Shouldn't happen unless list of advertised channels to
* mac80211 has been changed. * mac80211 has been changed.
@ -2332,7 +2332,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 == NL80211_BAND_5GHZ) if (phy_mode == MODE_11B && status->band == IEEE80211_BAND_5GHZ)
ath10k_dbg(ar, ATH10K_DBG_MGMT, "wmi mgmt rx 11b (CCK) on 5GHz\n"); ath10k_dbg(ar, ATH10K_DBG_MGMT, "wmi mgmt rx 11b (CCK) on 5GHz\n");
sband = &ar->mac.sbands[status->band]; sband = &ar->mac.sbands[status->band];
@ -2387,7 +2387,7 @@ static int freq_to_idx(struct ath10k *ar, int freq)
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
int band, ch, idx = 0; int band, ch, idx = 0;
for (band = NL80211_BAND_2GHZ; band < NUM_NL80211_BANDS; band++) { for (band = IEEE80211_BAND_2GHZ; band < IEEE80211_NUM_BANDS; band++) {
sband = ar->hw->wiphy->bands[band]; sband = ar->hw->wiphy->bands[band];
if (!sband) if (!sband)
continue; continue;