aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-11-14 21:21:24 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-11-14 21:21:24 +0000
commitb33f7e264c3c90ffb08c276260953c41ab04530a (patch)
tree70deb1fb004200bc1a35f568e983b5d845070ee1
parentb14b5bb03827cfe681c4d458842fa6487d546a82 (diff)
downloadupstream-b33f7e264c3c90ffb08c276260953c41ab04530a.tar.gz
upstream-b33f7e264c3c90ffb08c276260953c41ab04530a.tar.bz2
upstream-b33f7e264c3c90ffb08c276260953c41ab04530a.zip
ath9k: do not put the hardware to full-sleep while tx is pending
SVN-Revision: 29133
-rw-r--r--package/mac80211/patches/563-ath9k_fix_full_sleep_tx.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/package/mac80211/patches/563-ath9k_fix_full_sleep_tx.patch b/package/mac80211/patches/563-ath9k_fix_full_sleep_tx.patch
new file mode 100644
index 0000000000..17575b9e47
--- /dev/null
+++ b/package/mac80211/patches/563-ath9k_fix_full_sleep_tx.patch
@@ -0,0 +1,22 @@
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -118,7 +118,7 @@ void ath9k_ps_restore(struct ath_softc *
+ if (--sc->ps_usecount != 0)
+ goto unlock;
+
+- if (sc->ps_idle)
++ if (sc->ps_idle && !(sc->ps_flags & PS_WAIT_FOR_TX_ACK))
+ mode = ATH9K_PM_FULL_SLEEP;
+ else if (sc->ps_enabled &&
+ !(sc->ps_flags & (PS_WAIT_FOR_BEACON |
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -1983,7 +1983,7 @@ static void ath_tx_complete(struct ath_s
+ skb_pull(skb, padsize);
+ }
+
+- if (sc->ps_flags & PS_WAIT_FOR_TX_ACK) {
++ if ((sc->ps_flags & PS_WAIT_FOR_TX_ACK) && !txq->axq_depth) {
+ sc->ps_flags &= ~PS_WAIT_FOR_TX_ACK;
+ ath_dbg(common, ATH_DBG_PS,
+ "Going back to sleep after having received TX status (0x%lx)\n",