diff options
| author | Eliad Peller <eliad@wizery.com> | 2012-02-01 18:48:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-20 12:48:11 -0800 |
| commit | 36935521cd67e3df9a1db71591cf224252d6082c (patch) | |
| tree | 6724be07c372c8025a6f96bf7f7fe1ac8e8d87b5 /net | |
| parent | 4ac2f3d3f1d4a08ad6a450127c4b0f590fe28bdf (diff) | |
| download | lwn-36935521cd67e3df9a1db71591cf224252d6082c.tar.gz lwn-36935521cd67e3df9a1db71591cf224252d6082c.zip | |
mac80211: timeout a single frame in the rx reorder buffer
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 <eliad@wizery.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | 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 378bd67334ba..41000650f4a0 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -610,7 +610,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. |