From 230dc5316d3acafdbf097bee7670a82fa1a71bf5 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 31 May 2010 12:00:12 +0200 Subject: [PATCH] --- yaml --- r: 200163 b: refs/heads/master c: 51a0d38de26226f2779912d92f155b93d539da9a h: refs/heads/master i: 200161: eb16f01158ded75813d415805e20f74ad03bca6f 200159: c225ba04e05341cfaab352e18a5a039d3b61a0ca v: v3 --- [refs] | 2 +- trunk/net/mac80211/agg-tx.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f4d26de368da..1b888e75c06a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ae5977ff95c03fe6c36a5721c57dcb4bfe4f290 +refs/heads/master: 51a0d38de26226f2779912d92f155b93d539da9a diff --git a/trunk/net/mac80211/agg-tx.c b/trunk/net/mac80211/agg-tx.c index c163d0a149f4..98258b7341e3 100644 --- a/trunk/net/mac80211/agg-tx.c +++ b/trunk/net/mac80211/agg-tx.c @@ -332,14 +332,16 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid) IEEE80211_QUEUE_STOP_REASON_AGGREGATION); spin_unlock(&local->ampdu_lock); - spin_unlock_bh(&sta->lock); - /* send an addBA request */ + /* prepare tid data */ sta->ampdu_mlme.dialog_token_allocator++; sta->ampdu_mlme.tid_tx[tid]->dialog_token = sta->ampdu_mlme.dialog_token_allocator; sta->ampdu_mlme.tid_tx[tid]->ssn = start_seq_num; + spin_unlock_bh(&sta->lock); + + /* send AddBA request */ ieee80211_send_addba_request(sdata, pubsta->addr, tid, sta->ampdu_mlme.tid_tx[tid]->dialog_token, sta->ampdu_mlme.tid_tx[tid]->ssn,