From e8e5f60a0a31d69ee9691ea39ab5935872ed2856 Mon Sep 17 00:00:00 2001
From: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Date: Mon, 17 May 2010 18:57:54 -0700
Subject: [PATCH] --- yaml --- r: 202759 b: refs/heads/master c:
 de0f648dc769daabd0842a8dcf439d5f1f23e07f h: refs/heads/master i:   202757:
 41bd2c82a75b3a876ac1cce4c385e60a3f54766a   202755:
 9c17572c0d69cc88440c911de3e41aa63a8a59b0   202751:
 09c99c4de5de2d56b5401c971b172d8f1a869e79 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/net/wireless/ath/ath9k/xmit.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 48827b064864..00727cf62ba7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77c2061d10a408d0220c2b0e7faefe52d9c41008
+refs/heads/master: de0f648dc769daabd0842a8dcf439d5f1f23e07f
diff --git a/trunk/drivers/net/wireless/ath/ath9k/xmit.c b/trunk/drivers/net/wireless/ath/ath9k/xmit.c
index 859aa4ab0769..f63f6a944d62 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/xmit.c
@@ -2279,6 +2279,17 @@ void ath_tx_edma_tasklet(struct ath_softc *sc)
 
 		txok = !(txs.ts_status & ATH9K_TXERR_MASK);
 
+		/*
+		 * Make sure null func frame is acked before configuring
+		 * hw into ps mode.
+		 */
+		if (bf->bf_isnullfunc && txok) {
+			if ((sc->ps_flags & PS_ENABLED))
+				ath9k_enable_ps(sc);
+			else
+				sc->ps_flags |= PS_NULLFUNC_COMPLETED;
+		}
+
 		if (!bf_isampdu(bf)) {
 			bf->bf_retries = txs.ts_longretry;
 			if (txs.ts_status & ATH9K_TXERR_XRETRY)