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

Commit 94b3c45c authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: check status before send command 



Check the status before sending host command, if any of the condition
match, cancel the host command before queue

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 89db3b97

drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c

+14 −12
Original line number Diff line number Diff line
@@ -1001,6 +1001,20 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd) 
	IWL_DEBUG_INFO(trans, "Attempting to send sync command %s\n",

			get_cmd_string(cmd->id));



	if (test_bit(STATUS_EXIT_PENDING, &trans->shrd->status))

		return -EBUSY;





	if (test_bit(STATUS_RF_KILL_HW, &trans->shrd->status)) {

		IWL_ERR(trans, "Command %s aborted: RF KILL Switch\n",

			       get_cmd_string(cmd->id));

		return -ECANCELED;

	}

	if (test_bit(STATUS_FW_ERROR, &trans->shrd->status)) {

		IWL_ERR(trans, "Command %s failed: FW Error\n",

			       get_cmd_string(cmd->id));

		return -EIO;

	}

	set_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status);

	IWL_DEBUG_INFO(trans, "Setting HCMD_ACTIVE for command %s\n",

			get_cmd_string(cmd->id));
@@ -1041,18 +1055,6 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd) 
		}

	}



	if (test_bit(STATUS_RF_KILL_HW, &trans->shrd->status)) {

		IWL_ERR(trans, "Command %s aborted: RF KILL Switch\n",

			       get_cmd_string(cmd->id));

		ret = -ECANCELED;

		goto fail;

	}

	if (test_bit(STATUS_FW_ERROR, &trans->shrd->status)) {

		IWL_ERR(trans, "Command %s failed: FW Error\n",

			       get_cmd_string(cmd->id));

		ret = -EIO;

		goto fail;

	}

	if ((cmd->flags & CMD_WANT_SKB) && !cmd->reply_page) {

		IWL_ERR(trans, "Error: Response NULL in '%s'\n",

			  get_cmd_string(cmd->id));