ath9k: remove patch causing stability issues with powersave devices (FS#176)

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/package/kernel/mac80211/patches/341-ath9k-release-PS-buffered-frames-as-A-MPDU-if-enable.patch b/package/kernel/mac80211/patches/341-ath9k-release-PS-buffered-frames-as-A-MPDU-if-enable.patch
deleted file mode 100644 (file)
index 1cc1667..0000000
--- a/package/kernel/mac80211/patches/341-ath9k-release-PS-buffered-frames-as-A-MPDU-if-enable.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sun, 28 Aug 2016 13:15:10 +0200
-Subject: [PATCH] ath9k: release PS buffered frames as A-MPDU if enabled
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -1660,10 +1660,11 @@ void ath9k_release_buffered_frames(struc
-       struct ath_node *an = (struct ath_node *)sta->drv_priv;
-       struct ath_txq *txq = sc->tx.uapsdq;
-       struct ieee80211_tx_info *info;
-+      struct ath_frame_info *fi;
-       struct list_head bf_q;
-       struct ath_buf *bf_tail = NULL, *bf;
-       int sent = 0;
--      int i;
-+      int n, i;
- 
-       INIT_LIST_HEAD(&bf_q);
-       for (i = 0; tids && nframes; i++, tids >>= 1) {
-@@ -1683,10 +1684,15 @@ void ath9k_release_buffered_frames(struc
-                       ath9k_set_moredata(sc, bf, true);
-                       list_add_tail(&bf->list, &bf_q);
-                       ath_set_rates(tid->an->vif, tid->an->sta, bf, true);
--                      if (bf_isampdu(bf)) {
-+                      if (bf_isampdu(bf))
-                               ath_tx_addto_baw(sc, tid, bf);
--                              bf->bf_state.bf_type &= ~BUF_AGGR;
-+                      if (bf_isaggr(bf)) {
-+                              fi = get_frame_info(bf->bf_mpdu);
-+                              n = ath_compute_num_delims(sc, tid, bf,
-+                                                         fi->framelen, true);
-+                              bf->bf_state.ndelim = n;
-                       }
-+
-                       if (bf_tail)
-                               bf_tail->bf_next = bf;
- 

diff --git a/package/kernel/mac80211/patches/342-ath9k-report-tx-status-on-EOSP.patch b/package/kernel/mac80211/patches/341-ath9k-report-tx-status-on-EOSP.patch
similarity index 100%
rename from package/kernel/mac80211/patches/342-ath9k-report-tx-status-on-EOSP.patch
rename to package/kernel/mac80211/patches/341-ath9k-report-tx-status-on-EOSP.patch

diff --git a/package/kernel/mac80211/patches/343-ath9k-fix-block-ack-window-tracking-issues.patch b/package/kernel/mac80211/patches/342-ath9k-fix-block-ack-window-tracking-issues.patch
similarity index 94%
rename from package/kernel/mac80211/patches/343-ath9k-fix-block-ack-window-tracking-issues.patch
rename to package/kernel/mac80211/patches/342-ath9k-fix-block-ack-window-tracking-issues.patch
index 007a8d7d62ca80c840eb8cbe9e7dfd947bf56afd..fea147b1821cbdaf47d218fb61c9f10950678715 100644 (file)
--- a/package/kernel/mac80211/patches/343-ath9k-fix-block-ack-window-tracking-issues.patch
+++ b/package/kernel/mac80211/patches/342-ath9k-fix-block-ack-window-tracking-issues.patch
@@ -100,12 +100,15 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                bf->bf_state.ndelim = ndelim;
  
                list_add_tail(&bf->list, bf_q);
-@@ -1685,8 +1694,6 @@ void ath9k_release_buffered_frames(struc
+@@ -1684,10 +1693,8 @@ void ath9k_release_buffered_frames(struc
                        ath9k_set_moredata(sc, bf, true);
                        list_add_tail(&bf->list, &bf_q);
                        ath_set_rates(tid->an->vif, tid->an->sta, bf, true);
--                      if (bf_isampdu(bf))
+-                      if (bf_isampdu(bf)) {
 -                              ath_tx_addto_baw(sc, tid, bf);
-                       if (bf_isaggr(bf)) {
-                               fi = get_frame_info(bf->bf_mpdu);
-                               n = ath_compute_num_delims(sc, tid, bf,
++                      if (bf_isampdu(bf))
+                               bf->bf_state.bf_type &= ~BUF_AGGR;
+-                      }
+                       if (bf_tail)
+                               bf_tail->bf_next = bf;
+ 

diff --git a/package/kernel/mac80211/patches/344-mac80211-send-delBA-on-unexpected-BlockAck-data-fram.patch b/package/kernel/mac80211/patches/343-mac80211-send-delBA-on-unexpected-BlockAck-data-fram.patch
similarity index 100%
rename from package/kernel/mac80211/patches/344-mac80211-send-delBA-on-unexpected-BlockAck-data-fram.patch
rename to package/kernel/mac80211/patches/343-mac80211-send-delBA-on-unexpected-BlockAck-data-fram.patch

diff --git a/package/kernel/mac80211/patches/345-mac80211-send-delBA-on-unexpected-BlockAck-Request.patch b/package/kernel/mac80211/patches/344-mac80211-send-delBA-on-unexpected-BlockAck-Request.patch
similarity index 100%
rename from package/kernel/mac80211/patches/345-mac80211-send-delBA-on-unexpected-BlockAck-Request.patch
rename to package/kernel/mac80211/patches/344-mac80211-send-delBA-on-unexpected-BlockAck-Request.patch

diff --git a/package/kernel/mac80211/patches/346-mac80211-Move-reorder-sensitive-TX-handlers-to-after.patch b/package/kernel/mac80211/patches/345-mac80211-Move-reorder-sensitive-TX-handlers-to-after.patch
similarity index 100%
rename from package/kernel/mac80211/patches/346-mac80211-Move-reorder-sensitive-TX-handlers-to-after.patch
rename to package/kernel/mac80211/patches/345-mac80211-Move-reorder-sensitive-TX-handlers-to-after.patch