mac80211: implement fair queueing per txq

[deliverable/linux.git] / net / mac80211 / agg-tx.c

diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index 42fa81031dfa94b10352864778542bbb471998d5..5650c46bf91a6f51bacc6d6516beeb3823528837 100644 (file)
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -194,17 +194,21 @@ static void
 ieee80211_agg_stop_txq(struct sta_info *sta, int tid)
 {
        struct ieee80211_txq *txq = sta->sta.txq[tid];
+       struct ieee80211_sub_if_data *sdata;
+       struct fq *fq;
        struct txq_info *txqi;
 
        if (!txq)
                return;
 
        txqi = to_txq_info(txq);
+       sdata = vif_to_sdata(txq->vif);
+       fq = &sdata->local->fq;
 
        /* Lock here to protect against further seqno updates on dequeue */
-       spin_lock_bh(&txqi->queue.lock);
+       spin_lock_bh(&fq->lock);
        set_bit(IEEE80211_TXQ_STOP, &txqi->flags);
-       spin_unlock_bh(&txqi->queue.lock);
+       spin_unlock_bh(&fq->lock);
 }
 
 static void