34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
|
From 07ae2dfcf4f7143ce191c6436da1c33f179af0d6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eliad Peller <eliad@wizery.com>
|
||
|
|
Date: Wed, 1 Feb 2012 18:48:09 +0200
|
||
|
|
Subject: [PATCH] mac80211: timeout a single frame in the rx reorder buffer
|
||
|
|
|
||
|
|
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 <eliad@wizery.com>
|
||
|
|
Cc: <stable@vger.kernel.org>
|
||
|
|
Acked-by: Johannes Berg <johannes@sipsolutions.net>
|
||
|
|
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
||
|
|
---
|
||
|
|
net/mac80211/rx.c | 2 +-
|
||
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
|
||
|
|
index 7514091..5a5e504 100644
|
||
|
|
--- a/net/mac80211/rx.c
|
||
|
|
+++ b/net/mac80211/rx.c
|
||
|
|
@@ -611,7 +611,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw,
|
||
|
|
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.
|
||
|
|
--
|
||
|
|
1.7.4.4
|
||
|
|
|