From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 10 Jun 2010 08:21:45 +0000 (+0200)
Subject: mac80211: fix RX aggregation timer
X-Git-Tag: v2.6.36-rc1~571^2~540^2~83
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f955ebb44798e0058c987a0817810d2542e87349;p=~shefty%2Frdma-dev.git

mac80211: fix RX aggregation timer

I noticed that when there was _no_ traffic at
all on a given aggregation session, it would
never time out. This won't happen unless you
forced creating a session, but fix it anyway.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index 1c4320b01e3..aa858a03951 100644
--- a/net/mac80211/agg-rx.c
+++ b/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);