From a9094a1a87984cb16530bbe90edbbbf000fdce04 Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sun, 24 Apr 2011 20:41:16 +0200
Subject: [PATCH] --- yaml --- r: 247191 b: refs/heads/master c:
 334df731976ee4042c9bf18b2eec9c0a71f45389 h: refs/heads/master i:   247189:
 27cdeea170c9a4e6acfd6a670c9d4a0e6f63c917   247187:
 3d09bb39486ad26891788356b53b4b0f1df1922b   247183:
 949dc060f20345bd666d53c7f7d99989692d3cbe v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/rx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9ea58a05fae3..6f3db9d4cb08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caf1eae206688210f61f3b48627ce4ca3c709784
+refs/heads/master: 334df731976ee4042c9bf18b2eec9c0a71f45389
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 1f06b31e21c1..b04a4378adcc 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/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);