summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-10 03:37:23 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-10 03:37:23 +0000
commit239c6f2e2d9fb58aad9a159523590628bd354c74 (patch)
treeb9203ff4e51ce3bca23172af95b9dab3167f0875
parentd1654e533991b03b13c5d12a137efe749415ed8f (diff)
ath9k: remove an old tx stop workaround which conflicts with the powersave fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25439 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/532-ath9k_remove_pending_frames_workaround.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/package/mac80211/patches/532-ath9k_remove_pending_frames_workaround.patch b/package/mac80211/patches/532-ath9k_remove_pending_frames_workaround.patch
new file mode 100644
index 0000000000..e368bce64b
--- /dev/null
+++ b/package/mac80211/patches/532-ath9k_remove_pending_frames_workaround.patch
@@ -0,0 +1,36 @@
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -2223,33 +2223,6 @@ static void ath_tx_complete_poll_work(st
+ } else {
+ txq->axq_tx_inprogress = true;
+ }
+- } else {
+- /* If the queue has pending buffers, then it
+- * should be doing tx work (and have axq_depth).
+- * Shouldn't get to this state I think..but
+- * we do.
+- */
+- if (!(sc->sc_flags & (SC_OP_OFFCHANNEL)) &&
+- (txq->pending_frames > 0 ||
+- !list_empty(&txq->axq_acq) ||
+- txq->stopped)) {
+- ath_err(ath9k_hw_common(sc->sc_ah),
+- "txq: %p axq_qnum: %u,"
+- " mac80211_qnum: %i"
+- " axq_link: %p"
+- " pending frames: %i"
+- " axq_acq empty: %i"
+- " stopped: %i"
+- " axq_depth: 0 Attempting to"
+- " restart tx logic.\n",
+- txq, txq->axq_qnum,
+- txq->mac80211_qnum,
+- txq->axq_link,
+- txq->pending_frames,
+- list_empty(&txq->axq_acq),
+- txq->stopped);
+- ath_txq_schedule(sc, txq);
+- }
+ }
+ spin_unlock_bh(&txq->axq_lock);
+ }