iwlwifi: mvm: fix the recovery flow while connecting

In BSS mode in the disconnection flow, mac80211 removes
the AP station before the vif is set to unassociated.
Our firmware wants it the other way around: first set
the vif as unassociated, and then remove the AP station.

In order to bridge between those two different behaviors,
iwlmvm doesn't remove the station from the firmware when
mac80211 removes it, but only after the vif is set to
unassociated. The implementation is in
iwl_mvm_bss_info_changed_station:

if (assoc state was modified && mvmvif->ap_sta_id is VALID
    && assoc state is now UNASSC)
	remove_the_station_from_the_firmware()

During the recovery flow, mac80211 re-adds the AP station
and then reconfigures the vif. Since the vif is not
associated, and then, we enter the if above (which was
intended to be taken in the disconnection flow only) and
remove the station we just added. This defeats the
recovery flow.

Fix this by not removing the AP station in this flow if
we are in recovery flow.

Cc: stable@vger.kernel.org
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@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 d608ce8305c753911ca5a483f02fcf745a5a166b..d04a88c6c5932f300ad92b0aeb98e9e148b4e173 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -1988,14 +1988,32 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm,
                        WARN_ONCE(iwl_mvm_sf_update(mvm, vif, false),
                                  "Failed to update SF upon disassociation\n");
 
-                       /* remove AP station now that the MAC is unassoc */
-                       ret = iwl_mvm_rm_sta_id(mvm, vif, mvmvif->ap_sta_id);
-                       if (ret)
-                               IWL_ERR(mvm, "failed to remove AP station\n");
+                       /*
+                        * If we get an assert during the connection (after the
+                        * station has been added, but before the vif is set
+                        * to associated), mac80211 will re-add the station and
+                        * then configure the vif. Since the vif is not
+                        * associated, we would remove the station here and
+                        * this would fail the recovery.
+                        */
+                       if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART,
+                                     &mvm->status)) {
+                               /*
+                                * Remove AP station now that
+                                * the MAC is unassoc
+                                */
+                               ret = iwl_mvm_rm_sta_id(mvm, vif,
+                                                       mvmvif->ap_sta_id);
+                               if (ret)
+                                       IWL_ERR(mvm,
+                                               "failed to remove AP station\n");
+
+                               if (mvm->d0i3_ap_sta_id == mvmvif->ap_sta_id)
+                                       mvm->d0i3_ap_sta_id =
+                                               IWL_MVM_INVALID_STA;
+                               mvmvif->ap_sta_id = IWL_MVM_INVALID_STA;
+                       }
 
-                       if (mvm->d0i3_ap_sta_id == mvmvif->ap_sta_id)
-                               mvm->d0i3_ap_sta_id = IWL_MVM_INVALID_STA;
-                       mvmvif->ap_sta_id = IWL_MVM_INVALID_STA;
                        /* remove quota for this interface */
                        ret = iwl_mvm_update_quotas(mvm, false, NULL);
                        if (ret)