[14/28] mac80211: timeout a single frame in the rx reorder buffer
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-02-17 00:59:57
Also in:
lkml
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-02-17 00:59:57
Also in:
lkml
3.2-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eliad Peller <redacted> commit 07ae2dfcf4f7143ce191c6436da1c33f179af0d6 upstream. The current code checks for stored_mpdu_num > 1, causing the reorder_timer to be triggered indefinitely, but the frame is never timed-out (until the next packet is received) Signed-off-by: Eliad Peller <redacted> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c@@ -616,7 +616,7 @@ static void ieee80211_sta_reorder_releas index = seq_sub(tid_agg_rx->head_seq_num, tid_agg_rx->ssn) % tid_agg_rx->buf_size; if (!tid_agg_rx->reorder_buf[index] && - tid_agg_rx->stored_mpdu_num > 1) { + tid_agg_rx->stored_mpdu_num) { /* * No buffers ready to be released, but check whether any * frames in the reorder buffer have timed out.