iwlwifi: mvm: handle device start failures during restart

If the device fails during a restart, mac80211 now handles the
situation better but we still have a little bit of cleanup to
do in the driver - add the required code.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: ArikX Nemtsov <arik@wizery.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index f2fde3649139..3c2c9b99b59e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -689,6 +689,16 @@ static int iwl_mvm_mac_start(struct ieee80211_hw *hw)
                 iwl_mvm_restart_cleanup(mvm);
 
         ret = iwl_mvm_up(mvm);
+
+        if (ret && test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status)) {
+                /* Something went wrong - we need to finish some cleanup
+                 * that normally iwl_mvm_mac_restart_complete() below
+                 * would do.
+                 */
+                clear_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status);
+                iwl_mvm_d0i3_enable_tx(mvm, NULL);
+        }
+
         mutex_unlock(&mvm->mutex);
 
         return ret;