summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2020-12-09 23:16:36 +0200
committerLuca Coelho <luciano.coelho@intel.com>2020-12-10 00:14:20 +0200
commit152fdc0f698896708f9d7889a4ba4da6944b74f7 (patch)
tree79fe31ce10fc6fbc070dc2d633e6e8980a7384eb /drivers
parent69d6cfc491f0d2f0429b3ef1cffd393d826f2c5d (diff)
downloadlinux-152fdc0f698896708f9d7889a4ba4da6944b74f7.tar.gz
linux-152fdc0f698896708f9d7889a4ba4da6944b74f7.tar.bz2
linux-152fdc0f698896708f9d7889a4ba4da6944b74f7.zip
iwlwifi: trans: consider firmware dead after errors
If we get an error, no longer consider the firmware to be in IWL_TRANS_FW_ALIVE state. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Link: https://lore.kernel.org/r/iwlwifi.20201209231352.a9d01e79c1c7.Ib2deb076b392fb516a7230bac91d7ab8a9586d86@changeid Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/iwl-trans.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
index b84921e1556c..83d06fb8beca 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
@@ -1439,8 +1439,10 @@ static inline void iwl_trans_fw_error(struct iwl_trans *trans)
return;
/* prevent double restarts due to the same erroneous FW */
- if (!test_and_set_bit(STATUS_FW_ERROR, &trans->status))
+ if (!test_and_set_bit(STATUS_FW_ERROR, &trans->status)) {
iwl_op_mode_nic_error(trans->op_mode);
+ trans->state = IWL_TRANS_NO_FW;
+ }
}
static inline bool iwl_trans_fw_running(struct iwl_trans *trans)