From b993ef7d0fed4eb94a5b0a0318e98c20b444d5bf Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 10 Jun 2010 10:21:45 +0200
Subject: [PATCH] --- yaml --- r: 203011 b: refs/heads/master c:
 f955ebb44798e0058c987a0817810d2542e87349 h: refs/heads/master i:   203009:
 aca1ed0f20eb39a6b0c81c43d7900e0bc7c73c71   203007:
 e8902f6aa99801c79457852fc3bfaec87fb74df0 v: v3

---
 [refs]                      | 2 +-
 trunk/net/mac80211/agg-rx.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dacd31d3ef8b..0d03a06b14b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c3b1dd8f483bf4bcb9776cd9cd3b37dd327d7ea
+refs/heads/master: f955ebb44798e0058c987a0817810d2542e87349
diff --git a/trunk/net/mac80211/agg-rx.c b/trunk/net/mac80211/agg-rx.c
index 1c4320b01e3c..aa858a03951c 100644
--- a/trunk/net/mac80211/agg-rx.c
+++ b/trunk/net/mac80211/agg-rx.c
@@ -274,6 +274,10 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
 
 	/* activate it for RX */
 	rcu_assign_pointer(sta->ampdu_mlme.tid_rx[tid], tid_agg_rx);
+
+	if (timeout)
+		mod_timer(&tid_agg_rx->session_timer, TU_TO_EXP_TIME(timeout));
+
 end:
 	spin_unlock_bh(&sta->lock);