leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwlwifi: mvm: Use beacon_get_template instead of beacon_get

Browse Source 
Call ieee80211_beacon_get_template instead of ieee80211_beacon_get and sync the
CSA counters with mac80211 after each beacon transmission.

Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Andrei Otcheretianski 2014-04-10 21:46:16 +03:00 committed by Emmanuel Grumbach
parent f0c9778396
commit fe887665a8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
View File

@ -969,7 +969,7 @@ int iwl_mvm_mac_ctxt_beacon_changed(struct iwl_mvm *mvm,
WARN_ON(vif->type != NL80211_IFTYPE_AP && WARN_ON(vif->type != NL80211_IFTYPE_AP &&
vif->type != NL80211_IFTYPE_ADHOC); vif->type != NL80211_IFTYPE_ADHOC);
beacon = ieee80211_beacon_get(mvm->hw, vif); beacon = ieee80211_beacon_get_template(mvm->hw, vif, NULL);
if (!beacon) if (!beacon)
return -ENOMEM; return -ENOMEM;
@ -1233,6 +1233,7 @@ int iwl_mvm_rx_beacon_notif(struct iwl_mvm *mvm,
if (unlikely(mvm->csa_vif && mvm->csa_vif->csa_active)) { if (unlikely(mvm->csa_vif && mvm->csa_vif->csa_active)) {
if (!ieee80211_csa_is_complete(mvm->csa_vif)) { if (!ieee80211_csa_is_complete(mvm->csa_vif)) {
ieee80211_csa_update_counter(mvm->csa_vif);
iwl_mvm_mac_ctxt_beacon_changed(mvm, mvm->csa_vif); iwl_mvm_mac_ctxt_beacon_changed(mvm, mvm->csa_vif);
} else { } else {
ieee80211_csa_finish(mvm->csa_vif); ieee80211_csa_finish(mvm->csa_vif);