diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-13 18:38:37 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-13 18:38:37 +0000 |
commit | 7ae2f4974863322a7ca42c58031d0e5f1293eff7 (patch) | |
tree | 0ad0e47fc5af3d1f3743024f8f7b5bb333149419 /package/mac80211/patches/522-ath9k_remove_pending_frames_workaround.patch | |
parent | f61f0b7178fa7591d9b4313b85cf8e47995d531c (diff) |
mac80211: update to wireless-testing 2011-03-11
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26128 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/522-ath9k_remove_pending_frames_workaround.patch')
-rw-r--r-- | package/mac80211/patches/522-ath9k_remove_pending_frames_workaround.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/package/mac80211/patches/522-ath9k_remove_pending_frames_workaround.patch b/package/mac80211/patches/522-ath9k_remove_pending_frames_workaround.patch new file mode 100644 index 000000000..e368bce64 --- /dev/null +++ b/package/mac80211/patches/522-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); + } |