ath6kl: Remove unnecessary recovery state check in ath6kl_recovery_hb_timer()

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>

diff --git a/drivers/net/wireless/ath/ath6kl/recovery.c b/drivers/net/wireless/ath/ath6kl/recovery.c
index c30df50b7ba4df7e0aefd851970206cfab7b29b4..1a82e8bf03c857eb0d8fb00275eda66ff0675345 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/recovery.c
+++ b/drivers/net/wireless/ath/ath6kl/recovery.c
@@ -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));
 }