diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-23 14:09:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-23 14:09:17 -0800 |
| commit | b4de921ae6f7bb211868be4f7d56e80ac6da676c (patch) | |
| tree | d0d740c43519d0e2b290f1499f82e2c03d6520a6 /drivers/net/wireless/ath/ath9k/main.c | |
| parent | 17a3be341e55b49e4579634281b86f1eb0bad8e8 (diff) | |
| parent | ed4b2019a62e2208a8370461dd91ed4de2c9fc8f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index c48743452515..9e68c1a8aef0 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1973,6 +1973,9 @@ int ath_reset(struct ath_softc *sc, bool retry_tx) struct ieee80211_hw *hw = sc->hw; int r; + /* Stop ANI */ + del_timer_sync(&common->ani.timer); + ath9k_hw_set_interrupts(ah, 0); ath_drain_all_txq(sc, retry_tx); ath_stoprecv(sc); @@ -2014,6 +2017,9 @@ int ath_reset(struct ath_softc *sc, bool retry_tx) } } + /* Start ANI */ + ath_start_ani(common); + return r; } |