iwlwifi: mvm: track changes in beacon count during channel switch

There are some buggy APs that keeps changing the count while forcing
us to block TX. This eventually results in queue hang, assert, and
disconnection. Detect such APs and disconnect gracefully in advance.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index af71e58bdd248bd5b71394bfaa13e920cd848e39..e18b57c84dd24372162ee37dcf3480d78b45b564 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -4662,6 +4662,9 @@ static int iwl_mvm_pre_channel_switch(struct ieee80211_hw *hw,
                        iwl_mvm_schedule_csa_period(mvm, vif,
                                                    vif->bss_conf.beacon_int,
                                                    apply_time);
+
+               mvmvif->csa_count = chsw->count;
+               mvmvif->csa_misbehave = false;
                break;
        default:
                break;
@@ -4700,6 +4703,18 @@ static void iwl_mvm_channel_switch_rx_beacon(struct ieee80211_hw *hw,
        if (!fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_CS_MODIFY))
                return;
 
+       if (chsw->count >= mvmvif->csa_count && chsw->block_tx) {
+               if (mvmvif->csa_misbehave) {
+                       /* Second time, give up on this AP*/
+                       iwl_mvm_abort_channel_switch(hw, vif);
+                       ieee80211_chswitch_done(vif, false);
+                       mvmvif->csa_misbehave = false;
+                       return;
+               }
+               mvmvif->csa_misbehave = true;
+       }
+       mvmvif->csa_count = chsw->count;
+
        IWL_DEBUG_MAC80211(mvm, "Modify CSA on mac %d\n", mvmvif->id);
 
        WARN_ON(iwl_mvm_send_cmd_pdu(mvm,

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 79d7fcb95b6f2d13110ce83889f133785c5f1c38..4e179e69fd32c713d2e6b30463f5db78b00e23bd 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -490,6 +490,8 @@ struct iwl_mvm_vif {
        bool csa_countdown;
        bool csa_failed;
        u16 csa_target_freq;
+       u16 csa_count;
+       u16 csa_misbehave;
        struct delayed_work csa_work;
 
        /* Indicates that we are waiting for a beacon on a new channel */