ath9k: add some more fixes to AP handling of buffered frames for powersave clients

[openwrt/staging/yousong.git] / package / mac80211 / patches / 572-ath9k_fix_tx_retry.patch

diff --git a/package/mac80211/patches/572-ath9k_fix_tx_retry.patch b/package/mac80211/patches/572-ath9k_fix_tx_retry.patch
index 755c3286e5468fc3c9aae1bfca6357377bdc7364..dfb09ba22e1c5ea9551061dfe456a914a5572c2e 100644 (file)
--- a/package/mac80211/patches/572-ath9k_fix_tx_retry.patch
+++ b/package/mac80211/patches/572-ath9k_fix_tx_retry.patch
@@ -1,11 +1,41 @@
 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -484,7 +484,7 @@ static void ath_tx_complete_aggr(struct 
+@@ -387,7 +387,6 @@ static void ath_tx_complete_aggr(struct 
+       struct ath_frame_info *fi;
+       int nframes;
+       u8 tidno;
+-      bool clear_filter;
+       int i, retries;
+ 
+       skb = bf->bf_mpdu;
+@@ -484,12 +483,10 @@ static void ath_tx_complete_aggr(struct 
                                 */
                                txfail = 1;
                        } else if (fi->retries < ATH_MAX_SW_RETRIES) {
 -                              if (!(ts->ts_status & ATH9K_TXERR_FILT) ||
-+                              if (!(ts->ts_status & ATH9K_TXERR_FILT) &&
-                                   !an->sleeping)
+-                                  !an->sleeping)
++                              if (txok || !an->sleeping)
                                        ath_tx_set_retry(sc, txq, bf->bf_mpdu,
                                                         retries);
+ 
+-                              clear_filter = true;
+                               txpending = 1;
+                       } else {
+                               txfail = 1;
+@@ -568,11 +565,13 @@ static void ath_tx_complete_aggr(struct 
+                       ieee80211_sta_set_tim(sta);
+ 
+               spin_lock_bh(&txq->axq_lock);
+-              if (clear_filter)
+-                      tid->ac->clear_ps_filter = true;
+               skb_queue_splice(&bf_pending, &tid->buf_q);
+-              if (!an->sleeping)
++              if (!an->sleeping) {
+                       ath_tx_queue_tid(txq, tid);
++
++                      if (ts->ts_status & ATH9K_TXERR_FILT)
++                              tid->ac->clear_ps_filter = true;
++              }
+               spin_unlock_bh(&txq->axq_lock);
+       }
+