Commit fcf8bd3b authored Apr 01, 2011 by Helmut Schaa Committed by John W. Linville Apr 04, 2011

mac80211: Fix duplicate frames on cooked monitor



Cleaning the ieee80211_rx_data.flags field here is wrong, instead the
flags should be valid accross processing the frame on different
interfaces. Fix this by removing the incorrect flags=0 assignment.

Introduced in commit 554891e6
(mac80211: move packet flags into packet).

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 5312c3f6

net/mac80211/rx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2541,7 +2541,6 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx)
		* same TID from the same station
		*/
		rx->skb = skb;
		rx->flags = 0;

		CALL_RXH(ieee80211_rx_h_decrypt)
		CALL_RXH(ieee80211_rx_h_check_more_data)
		@@ -2612,6 +2611,7 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid)
		.sdata = sta->sdata,
		.local = sta->local,
		.queue = tid,
		.flags = 0,
		};
		struct tid_ampdu_rx *tid_agg_rx;