From: benoit <benoit@0192ed92-7a03-0410-a25b-9323aeb14dbd>
Date: Sun, 1 Jun 2008 16:44:12 +0000 (+0000)
Subject: Avoid soft lockup with calibration timer. Merge from -dfs r3689
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=ec82a6dabdc86e2bbe4017a98f4d5faa5950270a;p=madwifi%2F.git

Avoid soft lockup with calibration timer. Merge from -dfs r3689


git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3690 0192ed92-7a03-0410-a25b-9323aeb14dbd
---

diff --git a/ath/if_ath.c b/ath/if_ath.c
index af2038a..63265d4 100644
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -2696,7 +2696,7 @@ ath_stop_locked(struct net_device *dev)
 		if (!sc->sc_invalid) {
 			del_timer_sync(&sc->sc_dfs_cac_timer);
 			if (!sc->sc_beacon_cal)
-				del_timer_sync(&sc->sc_cal_ch);
+				del_timer(&sc->sc_cal_ch);
 		}
 		ath_draintxq(sc);
 		if (!sc->sc_invalid) {
@@ -2719,7 +2719,7 @@ static void ath_set_beacon_cal(struct ath_softc *sc, int val)
 		return;
 
 	if (val) {
-		del_timer_sync(&sc->sc_cal_ch);
+		del_timer(&sc->sc_cal_ch);
 	} else {
 		mod_timer(&sc->sc_cal_ch, jiffies + (sc->sc_calinterval_sec * HZ));
 	}