From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 13 Mar 2012 11:19:19 +0000 (+0000)
Subject: ath9k: optimize waking tx queues, slightly improves performance under load
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dce6ee5830d79c038011ade15b970448a8215a3c;p=openwrt%2Fstaging%2Fnbd.git

ath9k: optimize waking tx queues, slightly improves performance under load

SVN-Revision: 30918
---

diff --git a/package/mac80211/patches/565-ath9k_optimize_queue_wake.patch b/package/mac80211/patches/565-ath9k_optimize_queue_wake.patch
new file mode 100644
index 0000000000..e04ffaafcb
--- /dev/null
+++ b/package/mac80211/patches/565-ath9k_optimize_queue_wake.patch
@@ -0,0 +1,39 @@
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -121,13 +121,24 @@ static void ath_txq_unlock_complete(stru
+ {
+ 	struct sk_buff_head q;
+ 	struct sk_buff *skb;
++	int qnum = txq->mac80211_qnum;
++	bool wake = false;
+ 
+ 	__skb_queue_head_init(&q);
+ 	skb_queue_splice_init(&txq->complete_q, &q);
++
++	if (txq->stopped && txq->pending_frames < ATH_MAX_QDEPTH) {
++		txq->stopped = false;
++		wake = true;
++	}
++
+ 	spin_unlock_bh(&txq->axq_lock);
+ 
+ 	while ((skb = __skb_dequeue(&q)))
+ 		ieee80211_tx_status(sc->hw, skb);
++
++	if (wake)
++		ieee80211_wake_queue(sc->hw, qnum);
+ }
+ 
+ static void ath_tx_queue_tid(struct ath_txq *txq, struct ath_atx_tid *tid)
+@@ -2037,11 +2048,6 @@ static void ath_tx_complete(struct ath_s
+ 	if (txq == sc->tx.txq_map[q]) {
+ 		if (WARN_ON(--txq->pending_frames < 0))
+ 			txq->pending_frames = 0;
+-
+-		if (txq->stopped && txq->pending_frames < ATH_MAX_QDEPTH) {
+-			ieee80211_wake_queue(sc->hw, q);
+-			txq->stopped = false;
+-		}
+ 	}
+ 
+ 	__skb_queue_tail(&txq->complete_q, skb);