Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7755bad9 authored by Ben Greear's avatar Ben Greear Committed by John W. Linville
Browse files

ath9k: Try more than one queue when scheduling new aggregate. 



Try all xmit queues until the hardware buffers are full.

Signed-off-by: default avatarBen Greear <greearb@candelatech.com>
Acked-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 55f6d0ff

drivers/net/wireless/ath/ath9k/xmit.c

+37 −27
Original line number Diff line number Diff line
@@ -1222,25 +1222,29 @@ void ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq) 
	sc->tx.txqsetup &= ~(1<<txq->axq_qnum);

}



/* For each axq_acq entry, for each tid, try to schedule packets

 * for transmit until ampdu_depth has reached min Q depth.

 */

void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq)

{

	struct ath_atx_ac *ac;

	struct ath_atx_tid *tid, *last;

	struct ath_atx_ac *ac, *ac_tmp, *last_ac;

	struct ath_atx_tid *tid, *last_tid;



	if (list_empty(&txq->axq_acq) ||

	    txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)

		return;



	ac = list_first_entry(&txq->axq_acq, struct ath_atx_ac, list);

	last = list_entry(ac->tid_q.prev, struct ath_atx_tid, list);

	last_ac = list_entry(txq->axq_acq.prev, struct ath_atx_ac, list);



	list_for_each_entry_safe(ac, ac_tmp, &txq->axq_acq, list) {

		last_tid = list_entry(ac->tid_q.prev, struct ath_atx_tid, list);

		list_del(&ac->list);

		ac->sched = false;



	do {

		if (list_empty(&ac->tid_q))

			return;



		tid = list_first_entry(&ac->tid_q, struct ath_atx_tid, list);

		while (!list_empty(&ac->tid_q)) {

			tid = list_first_entry(&ac->tid_q, struct ath_atx_tid,

					       list);

			list_del(&tid->list);

			tid->sched = false;
@@ -1256,9 +1260,10 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq) 
			if (!list_empty(&tid->buf_q))

				ath_tx_queue_tid(txq, tid);



		if (tid == last || txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)

			if (tid == last_tid ||

			    txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)

				break;

	} while (!list_empty(&ac->tid_q));

		}



		if (!list_empty(&ac->tid_q)) {

			if (!ac->sched) {
@@ -1266,6 +1271,11 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq) 
				list_add_tail(&ac->list, &txq->axq_acq);

			}

		}



		if (ac == last_ac ||

		    txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)

			return;

	}

}



/***********/