diff options
author | Don Fry <donald.h.fry@intel.com> | 2012-03-20 19:36:54 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-16 17:35:24 -0400 |
commit | 74fda9715cf611163cbe576a017e6bbaf53966ff (patch) | |
tree | 607d151851e4eeb32fe3a5b95f1a8d9592f3102f /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | 8a8bbdb4de0085b1e89eae33753c80299ab88ff6 (diff) |
iwlwifi: move HCMD_ACTIVE to trans
The HCMD_ACTIVE bit is only used in trans.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index a88130fb5520..6b1a03968583 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -1887,7 +1887,7 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv) | |||
1887 | if (ERROR_START_OFFSET <= table.valid * ERROR_ELEM_SIZE) { | 1887 | if (ERROR_START_OFFSET <= table.valid * ERROR_ELEM_SIZE) { |
1888 | IWL_ERR(trans, "Start IWL Error Log Dump:\n"); | 1888 | IWL_ERR(trans, "Start IWL Error Log Dump:\n"); |
1889 | IWL_ERR(trans, "Status: 0x%08lX, count: %d\n", | 1889 | IWL_ERR(trans, "Status: 0x%08lX, count: %d\n", |
1890 | priv->shrd->status, table.valid); | 1890 | priv->status, table.valid); |
1891 | } | 1891 | } |
1892 | 1892 | ||
1893 | trace_iwlwifi_dev_ucode_error(trans->dev, table.error_id, table.tsf_low, | 1893 | trace_iwlwifi_dev_ucode_error(trans->dev, table.error_id, table.tsf_low, |
@@ -2177,9 +2177,6 @@ static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand) | |||
2177 | /* Set the FW error flag -- cleared on iwl_down */ | 2177 | /* Set the FW error flag -- cleared on iwl_down */ |
2178 | set_bit(STATUS_FW_ERROR, &priv->status); | 2178 | set_bit(STATUS_FW_ERROR, &priv->status); |
2179 | 2179 | ||
2180 | /* Cancel currently queued command. */ | ||
2181 | clear_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status); | ||
2182 | |||
2183 | iwl_abort_notification_waits(&priv->notif_wait); | 2180 | iwl_abort_notification_waits(&priv->notif_wait); |
2184 | 2181 | ||
2185 | /* Keep the restart process from trying to send host | 2182 | /* Keep the restart process from trying to send host |