ath9k: fix a few more aggregation related issues, should improve stability

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25007 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/mac80211/patches/551-ath9k_txq_schedule_multi.patch b/package/mac80211/patches/551-ath9k_txq_schedule_multi.patch
new file mode 100644 (file)
index 0000000..5002c9b
--- /dev/null
+++ b/package/mac80211/patches/551-ath9k_txq_schedule_multi.patch
@@ -0,0 +1,29 @@
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -1224,12 +1224,14 @@ void ath_tx_cleanupq(struct ath_softc *s
+ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq)
+ {
+       struct ath_atx_ac *ac;
+-      struct ath_atx_tid *tid;
++      struct ath_atx_tid *tid, *last;
+ 
+-      if (list_empty(&txq->axq_acq))
++      if (list_empty(&txq->axq_acq) ||
++          txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)
+               return;
+ 
+       ac = list_first_entry(&txq->axq_acq, struct ath_atx_ac, list);
++      last = list_entry(ac->tid_q.prev, struct ath_atx_tid, list);
+       list_del(&ac->list);
+       ac->sched = false;
+ 
+@@ -1253,7 +1255,8 @@ void ath_txq_schedule(struct ath_softc *
+               if (!list_empty(&tid->buf_q))
+                       ath_tx_queue_tid(txq, tid);
+ 
+-              break;
++              if (tid == last || txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)
++                      break;
+       } while (!list_empty(&ac->tid_q));
+ 
+       if (!list_empty(&ac->tid_q)) {

diff --git a/package/mac80211/patches/552-ath9k_fix_bar.patch b/package/mac80211/patches/552-ath9k_fix_bar.patch
new file mode 100644 (file)
index 0000000..074b8f5
--- /dev/null
+++ b/package/mac80211/patches/552-ath9k_fix_bar.patch
@@ -0,0 +1,11 @@
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -429,7 +429,7 @@ static void ath_tx_complete_aggr(struct 
+ 
+       ath_tx_count_frames(sc, bf, ts, txok, &nframes, &nbad);
+       while (bf) {
+-              txfail = txpending = 0;
++              txfail = txpending = sendbar = 0;
+               bf_next = bf->bf_next;
+ 
+               skb = bf->bf_mpdu;