aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2008-07-10 00:47:19 +0300
committerJohn W. Linville <linville@tuxdriver.com>2008-07-14 14:52:56 -0400
commit2560b6e2e4b87df211ea39b3b02498959b70b4e8 (patch)
tree13e4b3dfb8a07ad2f45f3833f347d1334987a185 /net/mac80211/rx.c
parent4ece16a1cf9d36fee6d3ccb2c933296cf660e44d (diff)
downloadkernel_samsung_smdk4412-2560b6e2e4b87df211ea39b3b02498959b70b4e8.zip
kernel_samsung_smdk4412-2560b6e2e4b87df211ea39b3b02498959b70b4e8.tar.gz
kernel_samsung_smdk4412-2560b6e2e4b87df211ea39b3b02498959b70b4e8.tar.bz2
mac80211: Fix ieee80211_rx_reorder_ampdu: ignore QoS null packets
This patch fixes the check at the entrance to ieee80211_rx_reorder_ampdu. This check has been broken by 'mac80211: rx.c use new helpers'. Letting QoS NULL packet in ieee80211_rx_reorder_ampdu led to packet loss in RX. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 244ee2d..ba332c9 100644
--- a/net/mac80211/rx.c
+++ b/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 */