diff options
| author | Don Fry <donald.h.fry@intel.com> | 2012-03-20 16:36:54 -0700 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-16 14:35:24 -0700 |
| commit | 74fda9715cf611163cbe576a017e6bbaf53966ff (patch) | |
| tree | 607d151851e4eeb32fe3a5b95f1a8d9592f3102f /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | 8a8bbdb4de0085b1e89eae33753c80299ab88ff6 (diff) | |
| download | blackbird-op-linux-74fda9715cf611163cbe576a017e6bbaf53966ff.tar.gz blackbird-op-linux-74fda9715cf611163cbe576a017e6bbaf53966ff.zip | |
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) if (ERROR_START_OFFSET <= table.valid * ERROR_ELEM_SIZE) { IWL_ERR(trans, "Start IWL Error Log Dump:\n"); IWL_ERR(trans, "Status: 0x%08lX, count: %d\n", - priv->shrd->status, table.valid); + priv->status, table.valid); } 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) /* Set the FW error flag -- cleared on iwl_down */ set_bit(STATUS_FW_ERROR, &priv->status); - /* Cancel currently queued command. */ - clear_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status); - iwl_abort_notification_waits(&priv->notif_wait); /* Keep the restart process from trying to send host |
