Commit 1094fa26 authored Jun 02, 2013 by Eran Harary Committed by Johannes Berg Jun 04, 2013

iwlwifi: don't return -ERFKILL if SEND_IF_RFKILL is set



When CMD_SEND_IN_RFKILL is set, it is perfectly legitimate
to send a host command while RFKILL is asserted. In this
case, the host command sending functions should return 0
even if RFKILL is asserted.

Signed-off-by: Eran Harary <eran.harary@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 36946ce6

drivers/net/wireless/iwlwifi/pcie/tx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1527,7 +1527,8 @@ static int iwl_pcie_send_hcmd_sync(struct iwl_trans *trans,
		goto cancel;
		}

		if (test_bit(STATUS_RFKILL, &trans_pcie->status)) {
		if (!(cmd->flags & CMD_SEND_IN_RFKILL) &&
		test_bit(STATUS_RFKILL, &trans_pcie->status)) {
		IWL_DEBUG_RF_KILL(trans, "RFKILL in SYNC CMD... no rsp\n");
		ret = -ERFKILL;
		goto cancel;