aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index 923d19112e0c..456067b2f48d 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -559,7 +559,7 @@ void iwl_mvm_mac_ctxt_release(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
559 559
560static void iwl_mvm_ack_rates(struct iwl_mvm *mvm, 560static void iwl_mvm_ack_rates(struct iwl_mvm *mvm,
561 struct ieee80211_vif *vif, 561 struct ieee80211_vif *vif,
562 enum ieee80211_band band, 562 enum nl80211_band band,
563 u8 *cck_rates, u8 *ofdm_rates) 563 u8 *cck_rates, u8 *ofdm_rates)
564{ 564{
565 struct ieee80211_supported_band *sband; 565 struct ieee80211_supported_band *sband;
@@ -730,7 +730,7 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm,
730 rcu_read_lock(); 730 rcu_read_lock();
731 chanctx = rcu_dereference(vif->chanctx_conf); 731 chanctx = rcu_dereference(vif->chanctx_conf);
732 iwl_mvm_ack_rates(mvm, vif, chanctx ? chanctx->def.chan->band 732 iwl_mvm_ack_rates(mvm, vif, chanctx ? chanctx->def.chan->band
733 : IEEE80211_BAND_2GHZ, 733 : NL80211_BAND_2GHZ,
734 &cck_ack_rates, &ofdm_ack_rates); 734 &cck_ack_rates, &ofdm_ack_rates);
735 rcu_read_unlock(); 735 rcu_read_unlock();
736 736
@@ -1065,7 +1065,7 @@ static int iwl_mvm_mac_ctxt_send_beacon(struct iwl_mvm *mvm,
1065 cpu_to_le32(BIT(mvm->mgmt_last_antenna_idx) << 1065 cpu_to_le32(BIT(mvm->mgmt_last_antenna_idx) <<
1066 RATE_MCS_ANT_POS); 1066 RATE_MCS_ANT_POS);
1067 1067
1068 if (info->band == IEEE80211_BAND_5GHZ || vif->p2p) { 1068 if (info->band == NL80211_BAND_5GHZ || vif->p2p) {
1069 rate = IWL_FIRST_OFDM_RATE; 1069 rate = IWL_FIRST_OFDM_RATE;
1070 } else { 1070 } else {
1071 rate = IWL_FIRST_CCK_RATE; 1071 rate = IWL_FIRST_CCK_RATE;
@@ -1516,7 +1516,7 @@ void iwl_mvm_rx_stored_beacon_notif(struct iwl_mvm *mvm,
1516 rx_status.device_timestamp = le32_to_cpu(sb->system_time); 1516 rx_status.device_timestamp = le32_to_cpu(sb->system_time);
1517 rx_status.band = 1517 rx_status.band =
1518 (sb->phy_flags & cpu_to_le16(RX_RES_PHY_FLAGS_BAND_24)) ? 1518 (sb->phy_flags & cpu_to_le16(RX_RES_PHY_FLAGS_BAND_24)) ?
1519 IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ; 1519 NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
1520 rx_status.freq = 1520 rx_status.freq =
1521 ieee80211_channel_to_frequency(le16_to_cpu(sb->channel), 1521 ieee80211_channel_to_frequency(le16_to_cpu(sb->channel),
1522 rx_status.band); 1522 rx_status.band);