Commit 07c89a60 authored May 21, 2019 by Emmanuel Grumbach Committed by Luca Coelho Sep 06, 2019

iwlwifi: mvm: remove redundant condition in iwl_mvm_set_hw_rfkill_state



If mvm->fwrt.cur_fw_img != IWL_UCODE_INIT, then
rfkill_safe_init_done must be true since
rfkill_safe_init_done is set to true before we start to load
the runtime image.
Remove the redundant condition.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

parent 79660869

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -1234,8 +1234,7 @@ static bool iwl_mvm_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state)
		* Stop the device if we run OPERATIONAL firmware or if we are in the
		* middle of the calibrations.
		*/
		return state && (mvm->fwrt.cur_fw_img != IWL_UCODE_INIT \|\|
		rfkill_safe_init_done);
		return state && rfkill_safe_init_done;
		}

		static void iwl_mvm_free_skb(struct iwl_op_mode op_mode, struct sk_buff skb)

Admin message