---

yaml --- r: 103424 b: refs/heads/master c: 2560b6e h: refs/heads/master v: v3
git-mirror · Jul 14, 2008 · 9ad5269 · 9ad5269
1 parent 088dc75
commit 9ad5269
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ece16a1cf9d36fee6d3ccb2c933296cf660e44d
+refs/heads/master: 2560b6e2e4b87df211ea39b3b02498959b70b4e8
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
@@ -2041,8 +2041,8 @@ static u8 ieee80211_rx_reorder_ampdu(struct ieee80211_local *local,
 
 	tid_agg_rx = sta->ampdu_mlme.tid_rx[tid];
 
-	/* null data frames are excluded */
-	if (unlikely(ieee80211_is_nullfunc(hdr->frame_control)))
+	/* qos null data frames are excluded */
+	if (unlikely(hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_NULLFUNC)))
 		goto end_reorder;
 
 	/* new un-ordered ampdu frame - process it */