From: benoit <benoit@0192ed92-7a03-0410-a25b-9323aeb14dbd>
Date: Sun, 1 Jun 2008 17:36:03 +0000 (+0000)
Subject: Revert part of previous change. Was too board. Merge -dfs r3691
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=4b8b3f3960ab4ef8504f3175098040ab3f45bb54;p=madwifi%2F.git

Revert part of previous change. Was too board. Merge -dfs r3691


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

diff --git a/ath/if_ath.c b/ath/if_ath.c
index 63265d4..2a96206 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(&sc->sc_cal_ch);
+				del_timer_sync(&sc->sc_cal_ch);
 		}
 		ath_draintxq(sc);
 		if (!sc->sc_invalid) {