---

yaml --- r: 275676 b: refs/heads/master c: 24b9c37 h: refs/heads/master v: v3
git-mirror · Nov 7, 2011 · c655b90 · c655b90
1 parent 9b3e83a
commit c655b90
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db652e4b36e5f1e5f49a4a49caf3aa365fe851c4
+refs/heads/master: 24b9c373ab787ccacfa2c46736153708796f5cd6
diff --git a/trunk/net/mac80211/sta_info.c b/trunk/net/mac80211/sta_info.c
@@ -1354,12 +1354,12 @@ ieee80211_sta_ps_deliver_response(struct sta_info *sta,
 			 * Use MoreData flag to indicate whether there are
 			 * more buffered frames for this STA
 			 */
-			if (!more_data)
-				hdr->frame_control &=
-					cpu_to_le16(~IEEE80211_FCTL_MOREDATA);
-			else
+			if (more_data || !skb_queue_empty(&frames))
 				hdr->frame_control |=
 					cpu_to_le16(IEEE80211_FCTL_MOREDATA);
+			else
+				hdr->frame_control &=
+					cpu_to_le16(~IEEE80211_FCTL_MOREDATA);
 
 			if (ieee80211_is_data_qos(hdr->frame_control) ||
 			    ieee80211_is_qos_nullfunc(hdr->frame_control))