diff options
| author | Christian Lamparter <chunkeey@googlemail.com> | 2011-04-24 20:41:16 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-26 15:50:31 -0400 |
| commit | 334df731976ee4042c9bf18b2eec9c0a71f45389 (patch) | |
| tree | e7bf04083a4924aaf41424100e2470db118a890b /net/mac80211/rx.c | |
| parent | caf1eae206688210f61f3b48627ce4ca3c709784 (diff) | |
| download | linux-334df731976ee4042c9bf18b2eec9c0a71f45389.tar.bz2 | |
mac80211: fix too early reorder release timer
The release timer has to expire "just" after a
frame is up for release. Currently, if the timer
callback starts on time, the "!time_after" check
above will start a new timer instead of
releasing the frames.
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
| -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 1f06b31e21c1..b04a4378adcc 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -652,7 +652,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw, set_release_timer: mod_timer(&tid_agg_rx->reorder_timer, - tid_agg_rx->reorder_time[j] + + tid_agg_rx->reorder_time[j] + 1 + HT_RX_REORDER_BUF_TIMEOUT); } else { del_timer(&tid_agg_rx->reorder_timer); |