From 1c3e33452fc64ddf0b30849e75ac2ba667fd9f81 Mon Sep 17 00:00:00 2001
From: Vivek Natarajan <vnatarajan@atheros.com>
Date: Fri, 18 Feb 2011 17:18:03 +0530
Subject: [PATCH] --- yaml --- r: 237430 b: refs/heads/master c:
 db28569adc692d9fb8a2d2d8e7ebab7fd5481f10 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/tx.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 873f9f26c101..58cd6e2d7f40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a63e2ce4e67f6df74f032ec302314141816e432
+refs/heads/master: db28569adc692d9fb8a2d2d8e7ebab7fd5481f10
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index 38e593939727..d0f91d74eaf0 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -236,6 +236,7 @@ ieee80211_tx_h_dynamic_ps(struct ieee80211_tx_data *tx)
 	if (local->hw.conf.flags & IEEE80211_CONF_PS) {
 		ieee80211_stop_queues_by_reason(&local->hw,
 						IEEE80211_QUEUE_STOP_REASON_PS);
+		ifmgd->flags &= ~IEEE80211_STA_NULLFUNC_ACKED;
 		ieee80211_queue_work(&local->hw,
 				     &local->dynamic_ps_disable_work);
 	}