---

yaml --- r: 266521 b: refs/heads/master c: 8a8656f h: refs/heads/master i: 266519: 6a55de8 v: v3
git-mirror · Sep 30, 2011 · 3c91176 · 3c91176
1 parent 4d9a2c6
commit 3c91176
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0b97a8ad5c4640785f9a1c8e979f1c0fba147e1
+refs/heads/master: 8a8656fa5bbbc8568348d95184d374edb03a48b7
diff --git a/trunk/net/mac80211/status.c b/trunk/net/mac80211/status.c
@@ -65,6 +65,16 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
 
 	sta->tx_filtered_count++;
 
+	/*
+	 * Clear more-data bit on filtered frames, it might be set
+	 * but later frames might time out so it might have to be
+	 * clear again ... It's all rather unlikely (this frame
+	 * should time out first, right?) but let's not confuse
+	 * peers unnecessarily.
+	 */
+	if (hdr->frame_control & cpu_to_le16(IEEE80211_FCTL_MOREDATA))
+		hdr->frame_control &= ~cpu_to_le16(IEEE80211_FCTL_MOREDATA);
+
 	if (ieee80211_is_data_qos(hdr->frame_control)) {
 		int tid = *ieee80211_get_qos_ctl(hdr) &
 					IEEE80211_QOS_CTL_TID_MASK;