mac80211: clear more-data bit on filtered frames

It doesn't seem likely, but maybe possible, that the
more-data bit needs to be recomputed due to changes
in the queued frames. Clear it for filtered frames
to ensure that we never send it incorrectly. It'll
be set again as necessary when we retransmit this
frame.

The more likely case is maybe where the station woke
up after the filtered frame in which case more-data
should be clear when the frame is transmitted to the
station since it is now awake.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index c06857bbd5730992411302eff47c9942ba408caf..94475eb51d2856f4c88b058d5b0984d6628ceb7b 100644 (file)
--- a/net/mac80211/status.c
+++ b/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;