diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-06-10 10:21:42 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-06-14 21:39:27 +0200 |
| commit | 0ab337032a0dfcd5f2527d3306d3deeba5f95b59 (patch) | |
| tree | 88795edc149fd88574fece0c8f23774ee8a9155c /net/mac80211/ht.c | |
| parent | mac80211: refcount aggregation queue stop (diff) | |
| download | linux-0ab337032a0dfcd5f2527d3306d3deeba5f95b59.tar.xz linux-0ab337032a0dfcd5f2527d3306d3deeba5f95b59.zip | |
mac80211: make TX aggregation start/stop request async
When the driver or rate control requests starting
or stopping an aggregation session, that currently
causes a direct callback into the driver, which
could potentially cause locking problems. Also,
the functions need to be callable from contexts
that cannot sleep, and thus will interfere with
making the ampdu_action callback sleeping.
To address these issues, add a new work item for
each station that will process any start or stop
requests out of line.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ht.c')
| -rw-r--r-- | net/mac80211/ht.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index 1af173ed2d5e..4dfba7808a24 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c @@ -105,6 +105,8 @@ void ieee80211_sta_tear_down_BA_sessions(struct sta_info *sta) { int i; + cancel_work_sync(&sta->ampdu_mlme.work); + for (i = 0; i < STA_TID_NUM; i++) { __ieee80211_stop_tx_ba_session(sta, i, WLAN_BACK_INITIATOR); __ieee80211_stop_rx_ba_session(sta, i, WLAN_BACK_RECIPIENT, |