ath9k: remove an old tx stop workaround which conflicts with the powersave fixes
authorFelix Fietkau <nbd@openwrt.org>
Thu, 10 Feb 2011 03:37:23 +0000 (03:37 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Thu, 10 Feb 2011 03:37:23 +0000 (03:37 +0000)
SVN-Revision: 25439

package/mac80211/patches/532-ath9k_remove_pending_frames_workaround.patch [new file with mode: 0644]

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 (file)
index 0000000..e368bce
--- /dev/null
@@ -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);
+               }