aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
diff options
context:
space:
mode:
authorIlan Peer <ilan.peer@intel.com>2019-01-20 10:45:16 -0500
committerLuca Coelho <luciano.coelho@intel.com>2019-02-20 13:47:54 -0500
commit1e78e759bed84cc55e08cc10988287464a49747f (patch)
treeb14a2adcf6265991237ff2cdc9898f698f6c624b /drivers/net/wireless/intel/iwlwifi/mvm/ops.c
parent6cc6ba3a0d9af64bfba573dec385af4302a29700 (diff)
iwlwifi: mvm: Don't request HW restart if already requested
In case mac80211 was requested to perform an HW restart, but the HW restart has not started yet, there is no need to request another one. Signed-off-by: Ilan Peer <ilan.peer@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/ops.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/ops.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 33053d136a8c..0996c97c4b94 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -1320,6 +1320,9 @@ void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error)
1320 reprobe->dev = mvm->trans->dev; 1320 reprobe->dev = mvm->trans->dev;
1321 INIT_WORK(&reprobe->work, iwl_mvm_reprobe_wk); 1321 INIT_WORK(&reprobe->work, iwl_mvm_reprobe_wk);
1322 schedule_work(&reprobe->work); 1322 schedule_work(&reprobe->work);
1323 } else if (test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED,
1324 &mvm->status)) {
1325 IWL_ERR(mvm, "HW restart already requested, but not started\n");
1323 } else if (mvm->fwrt.cur_fw_img == IWL_UCODE_REGULAR && 1326 } else if (mvm->fwrt.cur_fw_img == IWL_UCODE_REGULAR &&
1324 mvm->hw_registered && 1327 mvm->hw_registered &&
1325 !test_bit(STATUS_TRANS_DEAD, &mvm->trans->status)) { 1328 !test_bit(STATUS_TRANS_DEAD, &mvm->trans->status)) {