aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorHelmut Schaa <helmut.schaa@googlemail.com>2011-04-01 09:46:05 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-04-04 15:22:11 -0400
commitfcf8bd3ba5362682f945a3f838070ac5e10ff871 (patch)
tree8c3c05ff4bb73bf05de06d050e3173b724e005ae /net/mac80211
parent5312c3f60ba49073081b2dc421f9f3c22dd43d99 (diff)
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 554891e63a29af35cc6bb403ef34e319518114d0 (mac80211: move packet flags into packet). Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index aa5cc37b4921..2afeac9c6453 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2541,7 +2541,6 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx)
2541 * same TID from the same station 2541 * same TID from the same station
2542 */ 2542 */
2543 rx->skb = skb; 2543 rx->skb = skb;
2544 rx->flags = 0;
2545 2544
2546 CALL_RXH(ieee80211_rx_h_decrypt) 2545 CALL_RXH(ieee80211_rx_h_decrypt)
2547 CALL_RXH(ieee80211_rx_h_check_more_data) 2546 CALL_RXH(ieee80211_rx_h_check_more_data)
@@ -2612,6 +2611,7 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid)
2612 .sdata = sta->sdata, 2611 .sdata = sta->sdata,
2613 .local = sta->local, 2612 .local = sta->local,
2614 .queue = tid, 2613 .queue = tid,
2614 .flags = 0,
2615 }; 2615 };
2616 struct tid_ampdu_rx *tid_agg_rx; 2616 struct tid_ampdu_rx *tid_agg_rx;
2617 2617