summaryrefslogtreecommitdiffstats
path: root/net/mac80211/sta_info.c
diff options
context:
space:
mode:
authorJohannes Berg2010-06-10 10:21:43 +0200
committerJohn W. Linville2010-06-14 21:39:27 +0200
commit67c282c00c9c06733aae229662d209957f6d23a7 (patch)
tree698270941e46c873e2c34fda0428ea457cd1926b /net/mac80211/sta_info.c
parentmac80211: make TX aggregation start/stop request async (diff)
downloadkernel-qcow2-linux-67c282c00c9c06733aae229662d209957f6d23a7.tar.gz
kernel-qcow2-linux-67c282c00c9c06733aae229662d209957f6d23a7.tar.xz
kernel-qcow2-linux-67c282c00c9c06733aae229662d209957f6d23a7.zip
mac80211: move BA session work
Move the block-ack session works into common code, since it will be needed for RX agg too in the next patches. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r--net/mac80211/sta_info.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 8aa8558ba21e..bd726c6204df 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -235,7 +235,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
spin_lock_init(&sta->lock);
spin_lock_init(&sta->flaglock);
INIT_WORK(&sta->drv_unblock_wk, sta_unblock);
- INIT_WORK(&sta->ampdu_mlme.work, ieee80211_tx_ba_session_work);
+ INIT_WORK(&sta->ampdu_mlme.work, ieee80211_ba_session_work);
memcpy(sta->sta.addr, addr, ETH_ALEN);
sta->local = local;