diff options
| author | Arik Nemtsov <arik@wizery.com> | 2013-12-01 13:50:40 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2013-12-17 19:39:50 +0200 |
| commit | 2a988e98085a76c1a238442e67e53874944cb353 (patch) | |
| tree | 57d23374a6823e476d89ffd08535c91e69898f8c /drivers/net/wireless/iwlwifi/pcie/internal.h | |
| parent | 8c678ed4665d9c6452279b770eb43feed32ca3e8 (diff) | |
| download | linux-2a988e98085a76c1a238442e67e53874944cb353.tar.gz linux-2a988e98085a76c1a238442e67e53874944cb353.tar.bz2 linux-2a988e98085a76c1a238442e67e53874944cb353.zip | |
iwlwifi: trans: prevent reprobe on repeated FW errors before restart
In case a sync command timeouts or Tx is stuck while a FW error
interrupt arrives, we might call iwl_op_mode_nic_error twice before
a restart has been initiated. This will cause a reprobe. Unify calls
to this function at the transport level and only call it on the first
FW error in a given by checking the transport FW error flag.
While at it, remove the privately defined iwl_nic_error from PCIE code
and use the common callback instead.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/internal.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/internal.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/internal.h b/drivers/net/wireless/iwlwifi/pcie/internal.h index 8a2de33df48b..674c75b0d002 100644 --- a/drivers/net/wireless/iwlwifi/pcie/internal.h +++ b/drivers/net/wireless/iwlwifi/pcie/internal.h @@ -456,10 +456,4 @@ static inline bool iwl_is_rfkill_set(struct iwl_trans *trans) CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW); } -static inline void iwl_nic_error(struct iwl_trans *trans) -{ - set_bit(STATUS_FW_ERROR, &trans->status); - iwl_op_mode_nic_error(trans->op_mode); -} - #endif /* __iwl_trans_int_pcie_h__ */ |