diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-29 02:47:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-29 02:47:13 -0700 |
| commit | ed3f2e40f3d438f4a1ec0a898173116cb26f106a (patch) | |
| tree | f50e1c5f5f3511539084d9529e592e3fb0352607 /drivers/net/wireless/ath/ath9k/xmit.c | |
| parent | fb699dfd426a189fe33b91586c15176a75c8aed0 (diff) | |
| parent | bd6b4442ff3cee73f73987cf0c0e66ea677aa075 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/xmit.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index a8620b1d091..2a4efcbced6 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -2079,7 +2079,9 @@ static void ath_tx_complete_poll_work(struct work_struct *work) if (needreset) { ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET, "tx hung, resetting the chip\n"); + ath9k_ps_wakeup(sc); ath_reset(sc, false); + ath9k_ps_restore(sc); } ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, |