diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-01-24 18:54:16 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-01-24 18:54:16 +0000 |
| commit | 9b34dfb5715cceeddb974751bf60c4766cbf700b (patch) | |
| tree | d76d3bf6a8a28328e24e0c2a3d27aaca20233c9d /package/mac80211/patches/530-ath9k_cleanup_queue_wake.patch | |
| parent | 18c4d8389eb23d8dc5caaebd6a5bb8e3d130ed2f (diff) | |
| download | mtk-20170518-9b34dfb5715cceeddb974751bf60c4766cbf700b.zip mtk-20170518-9b34dfb5715cceeddb974751bf60c4766cbf700b.tar.gz mtk-20170518-9b34dfb5715cceeddb974751bf60c4766cbf700b.tar.bz2 | |
mac80211: update to wireless-testing 2011-01-24
SVN-Revision: 25093
Diffstat (limited to 'package/mac80211/patches/530-ath9k_cleanup_queue_wake.patch')
| -rw-r--r-- | package/mac80211/patches/530-ath9k_cleanup_queue_wake.patch | 118 |
1 files changed, 0 insertions, 118 deletions
diff --git a/package/mac80211/patches/530-ath9k_cleanup_queue_wake.patch b/package/mac80211/patches/530-ath9k_cleanup_queue_wake.patch deleted file mode 100644 index 0d9511f..0000000 --- a/package/mac80211/patches/530-ath9k_cleanup_queue_wake.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/xmit.c -+++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -1208,8 +1208,17 @@ bool ath_drain_all_txq(struct ath_softc - ath_err(common, "Failed to stop TX DMA!\n"); - - for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) { -- if (ATH_TXQ_SETUP(sc, i)) -- ath_draintxq(sc, &sc->tx.txq[i], retry_tx); -+ if (!ATH_TXQ_SETUP(sc, i)) -+ continue; -+ -+ /* -+ * The caller will resume queues with ieee80211_wake_queues. -+ * Mark the queue as not stopped to prevent ath_tx_complete -+ * from waking the queue too early. -+ */ -+ txq = &sc->tx.txq[i]; -+ txq->stopped = false; -+ ath_draintxq(sc, txq, retry_tx); - } - - return !npend; -@@ -1873,6 +1882,11 @@ static void ath_tx_complete(struct ath_s - spin_lock_bh(&txq->axq_lock); - if (WARN_ON(--txq->pending_frames < 0)) - txq->pending_frames = 0; -+ -+ if (txq->stopped && txq->pending_frames < ATH_MAX_QDEPTH) { -+ if (ath_mac80211_start_queue(sc, q)) -+ txq->stopped = 0; -+ } - spin_unlock_bh(&txq->axq_lock); - } - -@@ -1982,19 +1996,6 @@ static void ath_tx_rc_status(struct ath_ - tx_info->status.rates[tx_rateindex].count = ts->ts_longretry + 1; - } - --static void ath_wake_mac80211_queue(struct ath_softc *sc, int qnum) --{ -- struct ath_txq *txq; -- -- txq = sc->tx.txq_map[qnum]; -- spin_lock_bh(&txq->axq_lock); -- if (txq->stopped && txq->pending_frames < ATH_MAX_QDEPTH) { -- if (ath_mac80211_start_queue(sc, qnum)) -- txq->stopped = 0; -- } -- spin_unlock_bh(&txq->axq_lock); --} -- - static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) - { - struct ath_hw *ah = sc->sc_ah; -@@ -2005,7 +2006,6 @@ static void ath_tx_processq(struct ath_s - struct ath_tx_status ts; - int txok; - int status; -- int qnum; - - ath_dbg(common, ATH_DBG_QUEUE, "tx queue %d (%x), link %p\n", - txq->axq_qnum, ath9k_hw_gettxbuf(sc->sc_ah, txq->axq_qnum), -@@ -2084,17 +2084,12 @@ static void ath_tx_processq(struct ath_s - ath_tx_rc_status(bf, &ts, 1, txok ? 0 : 1, txok, true); - } - -- qnum = skb_get_queue_mapping(bf->bf_mpdu); -- - if (bf_isampdu(bf)) - ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, txok, - true); - else - ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, txok, 0); - -- if (txq == sc->tx.txq_map[qnum]) -- ath_wake_mac80211_queue(sc, qnum); -- - spin_lock_bh(&txq->axq_lock); - if (sc->sc_flags & SC_OP_TXAGGR) - ath_txq_schedule(sc, txq); -@@ -2163,7 +2158,6 @@ void ath_tx_edma_tasklet(struct ath_soft - struct list_head bf_head; - int status; - int txok; -- int qnum; - - for (;;) { - status = ath9k_hw_txprocdesc(ah, NULL, (void *)&txs); -@@ -2209,8 +2203,6 @@ void ath_tx_edma_tasklet(struct ath_soft - ath_tx_rc_status(bf, &txs, 1, txok ? 0 : 1, txok, true); - } - -- qnum = skb_get_queue_mapping(bf->bf_mpdu); -- - if (bf_isampdu(bf)) - ath_tx_complete_aggr(sc, txq, bf, &bf_head, &txs, - txok, true); -@@ -2218,9 +2210,6 @@ void ath_tx_edma_tasklet(struct ath_soft - ath_tx_complete_buf(sc, bf, txq, &bf_head, - &txs, txok, 0); - -- if (txq == sc->tx.txq_map[qnum]) -- ath_wake_mac80211_queue(sc, qnum); -- - spin_lock_bh(&txq->axq_lock); - if (!list_empty(&txq->txq_fifo_pending)) { - INIT_LIST_HEAD(&bf_head); ---- a/drivers/net/wireless/ath/ath9k/main.c -+++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -295,6 +295,8 @@ int ath_set_channel(struct ath_softc *sc - } - - ps_restore: -+ ieee80211_wake_queues(hw); -+ - spin_unlock_bh(&sc->sc_pcu_lock); - - ath9k_ps_restore(sc); |