From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sun, 24 Apr 2011 18:41:16 +0000 (+0200)
Subject: mac80211: fix too early reorder release timer
X-Git-Tag: MMI-PSA29.97-13-9~19291^2~16^2~272
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=334df731976ee4042c9bf18b2eec9c0a71f45389;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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);