Commit 2560b6e2 authored Jul 10, 2008 by Emmanuel Grumbach Committed by John W. Linville Jul 14, 2008

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>

parent 4ece16a1

net/mac80211/rx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 */