---

yaml --- r: 203011 b: refs/heads/master c: f955ebb h: refs/heads/master i: 203009: aca1ed0 203007: e8902f6 v: v3
git-mirror · Jun 14, 2010 · b993ef7 · b993ef7
1 parent 20ae5ef
commit b993ef7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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);