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

Commit 744cb695 authored by Eliad Peller's avatar Eliad Peller Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: clean refs before stop_device() 



Some implementations (i.e. mini_rpm) assume the references
are managed only while the device is started.

Move the stale reference cleanup before stopping the
device in order to make them happy.

Signed-off-by: default avatarEliad Peller <eliadx.peller@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent bd9c504b

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

+5 −4
Original line number Diff line number Diff line
@@ -903,6 +903,11 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm) 
	if (!test_and_clear_bit(IWL_MVM_STATUS_D3_RECONFIG, &mvm->status))

		iwl_mvm_fw_error_dump(mvm);



	/* cleanup all stale references (scan, roc), but keep the

	 * ucode_down ref until reconfig is complete

	 */

	iwl_mvm_unref_all_except(mvm, IWL_MVM_REF_UCODE_DOWN);



	iwl_trans_stop_device(mvm->trans);



	mvm->scan_status = IWL_MVM_SCAN_NONE;
@@ -932,10 +937,6 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm) 


	ieee80211_wake_queues(mvm->hw);



	/* cleanup all stale references (scan, roc), but keep the

	 * ucode_down ref until reconfig is complete */

	iwl_mvm_unref_all_except(mvm, IWL_MVM_REF_UCODE_DOWN);



	/* clear any stale d0i3 state */

	clear_bit(IWL_MVM_STATUS_IN_D0I3, &mvm->status);