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 63265d443853061d110dc9308dd7ba8e360bc4ec..2a96206a5553b038846dfa24772ba695dc2d3346 100644 (file)
--- 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) {