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

Commit 17acd0b6 authored by Don Fry's avatar Don Fry Committed by John W. Linville
Browse files

iwlwifi: move FW_ERROR to priv 



The op_mode should check for FW_ERROR before calling send_cmd.  This
removes the need to test for FW_ERROR in the trans layer.

Signed-off-by: default avatarDon Fry <donald.h.fry@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e3ec26de

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+6 −0
Original line number Diff line number Diff line
@@ -1298,6 +1298,12 @@ int iwl_dvm_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) 
		return -EIO;

	}



	if (test_bit(STATUS_FW_ERROR, &priv->status)) {

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

			get_cmd_string(cmd->id));

		return -EIO;

	}



	/*

	 * Synchronous commands from this op-mode must hold

	 * the mutex, this ensures we don't try to send two

drivers/net/wireless/iwlwifi/iwl-agn.c

+3 −4
Original line number Diff line number Diff line
@@ -920,11 +920,10 @@ void iwl_down(struct iwl_priv *priv) 
				STATUS_RF_KILL_HW |

			test_bit(STATUS_GEO_CONFIGURED, &priv->status) <<

				STATUS_GEO_CONFIGURED |

			test_bit(STATUS_FW_ERROR, &priv->status) <<

				STATUS_FW_ERROR |

			test_bit(STATUS_EXIT_PENDING, &priv->status) <<

				STATUS_EXIT_PENDING;

	priv->shrd->status &=

			test_bit(STATUS_FW_ERROR, &priv->shrd->status) <<

				STATUS_FW_ERROR;



	dev_kfree_skb(priv->beacon_skb);

	priv->beacon_skb = NULL;
@@ -1013,7 +1012,7 @@ static void iwl_bg_restart(struct work_struct *data) 
	if (test_bit(STATUS_EXIT_PENDING, &priv->status))

		return;



	if (test_and_clear_bit(STATUS_FW_ERROR, &priv->shrd->status)) {

	if (test_and_clear_bit(STATUS_FW_ERROR, &priv->status)) {

		mutex_lock(&priv->mutex);

		iwlagn_prepare_restart(priv);

		mutex_unlock(&priv->mutex);

drivers/net/wireless/iwlwifi/iwl-core.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand) 
	priv->ucode_loaded = false;



	/* Set the FW error flag -- cleared on iwl_down */

	set_bit(STATUS_FW_ERROR, &priv->shrd->status);

	set_bit(STATUS_FW_ERROR, &priv->status);



	/* Cancel currently queued command. */

	clear_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status);

drivers/net/wireless/iwlwifi/iwl-debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static ssize_t iwl_dbgfs_status_read(struct file *file, 
	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_POWER_PMI:\t %d\n",

		test_bit(STATUS_POWER_PMI, &priv->shrd->status));

	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_FW_ERROR:\t %d\n",

		test_bit(STATUS_FW_ERROR, &priv->shrd->status));

		test_bit(STATUS_FW_ERROR, &priv->status));

	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);

}

drivers/net/wireless/iwlwifi/iwl-scan.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int iwl_send_scan_abort(struct iwl_priv *priv) 
	if (!test_bit(STATUS_READY, &priv->status) ||

	    !test_bit(STATUS_GEO_CONFIGURED, &priv->status) ||

	    !test_bit(STATUS_SCAN_HW, &priv->status) ||

	    test_bit(STATUS_FW_ERROR, &priv->shrd->status))

	    test_bit(STATUS_FW_ERROR, &priv->status))

		return -EIO;



	ret = iwl_dvm_send_cmd(priv, &cmd);