1 --- a/drivers/net/wireless/ath/ath9k/xmit.c
2 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
3 @@ -1317,8 +1317,8 @@ ath_tx_form_burst(struct ath_softc *sc,
7 -static void ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq,
8 - struct ath_atx_tid *tid)
9 +static bool ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq,
10 + struct ath_atx_tid *tid, bool *stop)
13 struct ieee80211_tx_info *tx_info;
14 @@ -1327,40 +1327,41 @@ static void ath_tx_sched_aggr(struct ath
16 bool aggr, last = true;
19 - if (!ath_tid_has_buffered(tid))
22 - INIT_LIST_HEAD(&bf_q);
24 - bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q);
27 + if (!ath_tid_has_buffered(tid))
30 - tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
31 - aggr = !!(tx_info->flags & IEEE80211_TX_CTL_AMPDU);
32 - if ((aggr && txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) ||
33 - (!aggr && txq->axq_depth >= ATH_NON_AGGR_MIN_QDEPTH))
35 + INIT_LIST_HEAD(&bf_q);
37 - ath_set_rates(tid->an->vif, tid->an->sta, bf);
39 - last = ath_tx_form_aggr(sc, txq, tid, &bf_q, bf,
42 - ath_tx_form_burst(sc, txq, tid, &bf_q, bf, tid_q);
43 + bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q);
47 + tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
48 + aggr = !!(tx_info->flags & IEEE80211_TX_CTL_AMPDU);
49 + if ((aggr && txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) ||
50 + (!aggr && txq->axq_depth >= ATH_NON_AGGR_MIN_QDEPTH)) {
55 + ath_set_rates(tid->an->vif, tid->an->sta, bf);
57 + last = ath_tx_form_aggr(sc, txq, tid, &bf_q, bf,
60 + ath_tx_form_burst(sc, txq, tid, &bf_q, bf, tid_q);
62 - if (list_empty(&bf_q))
64 + if (list_empty(&bf_q))
67 - if (tid->ac->clear_ps_filter) {
68 - tid->ac->clear_ps_filter = false;
69 - tx_info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
71 + if (tid->ac->clear_ps_filter) {
72 + tid->ac->clear_ps_filter = false;
73 + tx_info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT;
76 - ath_tx_fill_desc(sc, bf, txq, aggr_len);
77 - ath_tx_txqaddbuf(sc, txq, &bf_q, false);
79 + ath_tx_fill_desc(sc, bf, txq, aggr_len);
80 + ath_tx_txqaddbuf(sc, txq, &bf_q, false);
84 int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
85 @@ -1796,25 +1797,27 @@ void ath_tx_cleanupq(struct ath_softc *s
87 void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq)
89 - struct ath_atx_ac *ac, *ac_tmp, *last_ac;
90 + struct ath_atx_ac *ac, *last_ac;
91 struct ath_atx_tid *tid, *last_tid;
94 if (test_bit(SC_OP_HW_RESET, &sc->sc_flags) ||
95 - list_empty(&txq->axq_acq) ||
96 - txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)
97 + list_empty(&txq->axq_acq))
102 - ac = list_first_entry(&txq->axq_acq, struct ath_atx_ac, list);
103 last_ac = list_entry(txq->axq_acq.prev, struct ath_atx_ac, list);
104 + while (!list_empty(&txq->axq_acq)) {
107 - list_for_each_entry_safe(ac, ac_tmp, &txq->axq_acq, list) {
108 + ac = list_first_entry(&txq->axq_acq, struct ath_atx_ac, list);
109 last_tid = list_entry(ac->tid_q.prev, struct ath_atx_tid, list);
113 while (!list_empty(&ac->tid_q)) {
115 tid = list_first_entry(&ac->tid_q, struct ath_atx_tid,
117 list_del(&tid->list);
118 @@ -1823,7 +1826,8 @@ void ath_txq_schedule(struct ath_softc *
122 - ath_tx_sched_aggr(sc, txq, tid);
123 + if (ath_tx_sched_aggr(sc, txq, tid, &stop))
127 * add tid to round-robin queue if more frames
128 @@ -1832,8 +1836,7 @@ void ath_txq_schedule(struct ath_softc *
129 if (ath_tid_has_buffered(tid))
130 ath_tx_queue_tid(txq, tid);
132 - if (tid == last_tid ||
133 - txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)
134 + if (stop || tid == last_tid)
138 @@ -1842,9 +1845,17 @@ void ath_txq_schedule(struct ath_softc *
139 list_add_tail(&ac->list, &txq->axq_acq);
142 - if (ac == last_ac ||
143 - txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)
147 + if (ac == last_ac) {
152 + last_ac = list_entry(txq->axq_acq.prev,
153 + struct ath_atx_ac, list);