From 18506f13e98ccb1364ae5abe6a889865c55b4734 Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Mon, 3 Sep 2012 12:49:35 +0530 Subject: [PATCH] --- yaml --- r: 341445 b: refs/heads/master c: e451f947c59d527088ebbd4505e776e968b9539a h: refs/heads/master i: 341443: d43f471467ca7492e2cd26799f59363fd24143ab v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/recovery.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bca3e7adbb2a..49c97eb2f25f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d9188409aef2f3bebd1956d2f15bc970efcea7b +refs/heads/master: e451f947c59d527088ebbd4505e776e968b9539a diff --git a/trunk/drivers/net/wireless/ath/ath6kl/recovery.c b/trunk/drivers/net/wireless/ath/ath6kl/recovery.c index c30df50b7ba4..1a82e8bf03c8 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/recovery.c +++ b/trunk/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)); }