mac80211: make TX aggregation start/stop request async

[net-next-2.6.git] / net / mac80211 / tx.c

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 7bf1f9c9ea34214c8cdb6598728acecac63b797d..698d4718b1a4b062ddaa77f83577a0dec74aee21 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1102,6 +1102,11 @@ static bool ieee80211_tx_prep_agg(struct ieee80211_tx_data *tx,
 
        if (test_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state)) {
                info->flags |= IEEE80211_TX_CTL_AMPDU;
+       } else if (test_bit(HT_AGG_STATE_WANT_START, &tid_tx->state)) {
+               /*
+                * nothing -- this aggregation session is being started
+                * but that might still fail with the driver
+                */
        } else {
                spin_lock(&tx->sta->lock);
                /*