diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-01-28 16:23:14 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-01-28 16:23:14 -0500 |
| commit | 3e11210d46a4f252f41db6e442b46026aeddbb59 (patch) | |
| tree | b258375de649a5e04e8d567c850b47c41f8ceb11 /drivers/net/wireless/ath/ath9k/xmit.c | |
| parent | 3bf63e59e577cbecd41334c866f501c4cc5d54c5 (diff) | |
| parent | c7c1806098752c1f46943d8db2c69aff07f5d4bc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/init.c
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 d211aa7f1a3b..68a1c7612e9b 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -2173,9 +2173,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, |