diff options
| author | Don Fry <donald.h.fry@intel.com> | 2012-03-20 17:33:34 (GMT) |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-16 21:35:10 (GMT) |
| commit | 8a8bbdb4de0085b1e89eae33753c80299ab88ff6 (patch) | |
| tree | 981b12fdbba4f48508e37e21a24a7298825b8c53 /drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | |
| parent | dec63ce62b1567344a6da759fd13a7c72bab08ea (diff) | |
| download | linux-8a8bbdb4de0085b1e89eae33753c80299ab88ff6.tar.xz | |
iwlwifi: complete STATUS_READY refactoring
When WiMax takes over the RF, inform the op_mode.
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-trans-pcie-rx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c index b35f120..e1af031 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c @@ -547,14 +547,9 @@ static void iwl_irq_handle_error(struct iwl_trans *trans) APMS_CLK_VAL_MRB_FUNC_MODE) || (iwl_read_prph(trans, APMG_PS_CTRL_REG) & APMG_PS_CTRL_VAL_RESET_REQ))) { - /* - * Keep the restart process from trying to send host - * commands by clearing the ready bit. - */ - clear_bit(STATUS_READY, &trans->shrd->status); clear_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status); + iwl_op_mode_wimax_active(trans->op_mode); wake_up(&trans->wait_command_queue); - IWL_ERR(trans, "RF is used by WiMAX\n"); return; } |