Skip to content

Commit

Permalink
mac80211: fix RX aggregation timer
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Berg authored and John W. Linville committed Jun 14, 2010
1 parent 7c3b1dd commit f955ebb
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions net/mac80211/agg-rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit f955ebb

Please sign in to comment.