Commit cad7eb75 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: remove IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE 



There's no point in this, we already do everything in a nested
fashion, and if we didn't we'd already crash in iwl_mvm_leds_exit()
etc. Just remove the bit.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent a371bb64

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

+1 −4
Original line number Diff line number Diff line
@@ -803,12 +803,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
	ret = ieee80211_register_hw(mvm->hw);

	if (ret) {

		iwl_mvm_leds_exit(mvm);

		return ret;

	}



	mvm->init_status |= IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE;



	return 0;

	return ret;

}



static bool iwl_mvm_defer_tx(struct iwl_mvm *mvm,

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+0 −1
Original line number Diff line number Diff line
@@ -1221,7 +1221,6 @@ enum iwl_mvm_status { 
enum iwl_mvm_init_status {

	IWL_MVM_INIT_STATUS_THERMAL_INIT_COMPLETE = BIT(0),

	IWL_MVM_INIT_STATUS_LEDS_INIT_COMPLETE = BIT(1),

	IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE = BIT(2),

};



static inline bool iwl_mvm_is_radio_killed(struct iwl_mvm *mvm)

drivers/net/wireless/intel/iwlwifi/mvm/ops.c

+1 −4
Original line number Diff line number Diff line
@@ -919,10 +919,7 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode) 


	iwl_mvm_thermal_exit(mvm);



	if (mvm->init_status & IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE) {

	ieee80211_unregister_hw(mvm->hw);

		mvm->init_status &= ~IWL_MVM_INIT_STATUS_REG_HW_INIT_COMPLETE;

	}



	kfree(mvm->scan_cmd);

	kfree(mvm->mcast_filter_cmd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE