xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ath6kl: Remove unnecessary recovery state check in ath6kl_recovery_hb_timer()

Browse Source 
Checking for recovery state just before re-arming hb_timer is not
necessary, this should be done at the begining of the timer instead.

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Vasanthakumar Thiagarajan
2012-09-03 12:49:35 +05:30
committed by Kalle Valo
parent 9d9188409a
commit e451f947c5
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/ath/ath6kl/recovery.c
View File

@@ -61,7 +61,7 @@ static void ath6kl_recovery_hb_timer(unsigned long data)
struct ath6kl *ar = (struct ath6kl *) data;
int err;
if (!ar->fw_recovery.enable)
if (!ar->fw_recovery.enable || (ar->state == ATH6KL_STATE_RECOVERY))
return;
if (ar->fw_recovery.hb_pending)
@@ -86,9 +86,6 @@ static void ath6kl_recovery_hb_timer(unsigned long data)
ath6kl_warn("Failed to send hb challenge request, err:%d\n",
err);
if ((ar->state == ATH6KL_STATE_RECOVERY) || !ar->fw_recovery.enable)
return;
mod_timer(&ar->fw_recovery.hb_timer, jiffies +
msecs_to_jiffies(ar->fw_recovery.hb_poll));
}