1 files changed, 26 insertions, 0 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 55f114d24148..ddc400436782 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -431,6 +431,7 @@ static const struct iwl_hcmd_names iwl_mvm_system_names[] = {
 static const struct iwl_hcmd_names iwl_mvm_mac_conf_names[] = {
         HCMD_NAME(LINK_QUALITY_MEASUREMENT_CMD),
         HCMD_NAME(LINK_QUALITY_MEASUREMENT_COMPLETE_NOTIF),
+        HCMD_NAME(CHANNEL_SWITCH_NOA_NOTIF),
 };
 
 /* Please keep this array *SORTED* by hex value.
@@ -494,6 +495,29 @@ static u32 calc_min_backoff(struct iwl_trans *trans, const struct iwl_cfg *cfg)
 
 static void iwl_mvm_fw_error_dump_wk(struct work_struct *work);
 
+static void iwl_mvm_tx_unblock_dwork(struct work_struct *work)
+{
+        struct iwl_mvm *mvm =
+                container_of(work, struct iwl_mvm, cs_tx_unblock_dwork.work);
+        struct ieee80211_vif *tx_blocked_vif;
+        struct iwl_mvm_vif *mvmvif;
+
+        mutex_lock(&mvm->mutex);
+
+        tx_blocked_vif =
+                rcu_dereference_protected(mvm->csa_tx_blocked_vif,
+                                          lockdep_is_held(&mvm->mutex));
+
+        if (!tx_blocked_vif)
+                goto unlock;
+
+        mvmvif = iwl_mvm_vif_from_mac80211(tx_blocked_vif);
+        iwl_mvm_modify_all_sta_disable_tx(mvm, mvmvif, false);
+        RCU_INIT_POINTER(mvm->csa_tx_blocked_vif, NULL);
+unlock:
+        mutex_unlock(&mvm->mutex);
+}
+
 static struct iwl_op_mode *
 iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
                       const struct iwl_fw *fw, struct dentry *dbgfs_dir)
@@ -595,6 +619,8 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
 
         SET_IEEE80211_DEV(mvm->hw, mvm->trans->dev);
 
+        INIT_DELAYED_WORK(&mvm->cs_tx_unblock_dwork, iwl_mvm_tx_unblock_dwork);
+
         /*
          * Populate the state variables that the transport layer needs
          * to know about.