---

yaml --- r: 237430 b: refs/heads/master c: db28569 h: refs/heads/master v: v3
git-mirror · Feb 18, 2011 · 1c3e334 · 1c3e334
1 parent e4a60c8
commit 1c3e334
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);
 	}