diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-26 11:49:49 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-26 11:49:49 -0800 |
| commit | 9b6941d8b103fe95d1a90b7996046be9ee0e55e4 (patch) | |
| tree | 03c4e26abb8d6212741c3821061f2f40f2b5c8ec /drivers/net/wireless/ath/ath9k/xmit.c | |
| parent | de221bd5eb5e754806fcc39c40bb12b96515d9c5 (diff) | |
| parent | acd9f9cc305ca2e5da2a39f6f6160cd4b476e38b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-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, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 332d1feb5c18..33a37edbaf79 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -2113,9 +2113,7 @@ static void ath_tx_complete_poll_work(struct work_struct *work) if (needreset) { ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET, "tx hung, resetting the chip\n"); - ath9k_ps_wakeup(sc); ath_reset(sc, true); - ath9k_ps_restore(sc); } ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work, |