Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c47af22a authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarArikX Nemtsov <arik@wizery.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 75f6b9b6

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -689,6 +689,16 @@ static int iwl_mvm_mac_start(struct ieee80211_hw *hw) 
		iwl_mvm_restart_cleanup(mvm);

		iwl_mvm_restart_cleanup(mvm);





	ret = iwl_mvm_up(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);

	mutex_unlock(&mvm->mutex);





	return ret;

	return ret;