summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/mvm.h
diff options
context:
space:
mode:
authorJohannes Berg2015-03-10 14:44:00 +0100
committerEmmanuel Grumbach2015-03-18 07:40:02 +0100
commit81d62d5a9c4df3f4f7b0c5f5e1158f3fc4802fda (patch)
tree810735d584c51c570e2ff4061873f167f575c766 /drivers/net/wireless/iwlwifi/mvm/mvm.h
parentMerge branch 'iwlwifi-fixes' into iwlwifi-next (diff)
downloadkernel-qcow2-linux-81d62d5a9c4df3f4f7b0c5f5e1158f3fc4802fda.tar.gz
kernel-qcow2-linux-81d62d5a9c4df3f4f7b0c5f5e1158f3fc4802fda.tar.xz
kernel-qcow2-linux-81d62d5a9c4df3f4f7b0c5f5e1158f3fc4802fda.zip
iwlwifi: mvm: continue (with error) CSA on GO time event failure
If, on a GO, the CSA time event fails to be scheduled, continue the flow towards mac80211's state machine so it doesn't get stuck, but report an error later on the post switch which will cause mac80211 to tear down the operation. This ensures nothing gets stuck due to the scheduling failure. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mvm.h')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/mvm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index 432265eb0dd7..4903dec7048a 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -354,6 +354,7 @@ struct iwl_mvm_vif_bf_data {
* @beacon_stats: beacon statistics, containing the # of received beacons,
* # of received beacons accumulated over FW restart, and the current
* average signal of beacons retrieved from the firmware
+ * @csa_failed: CSA failed to schedule time event, report an error later
*/
struct iwl_mvm_vif {
struct iwl_mvm *mvm;
@@ -433,6 +434,7 @@ struct iwl_mvm_vif {
/* Indicates that CSA countdown may be started */
bool csa_countdown;
+ bool csa_failed;
};
static inline struct iwl_mvm_vif *