From fc88eb3fdfce6d39b4c62158cf6f42605a360a1e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 28 Sep 2016 09:49:31 +0200 Subject: [PATCH] ath9k: remove patch causing stability issues with powersave devices (FS#176) Signed-off-by: Felix Fietkau --- ...-buffered-frames-as-A-MPDU-if-enable.patch | 40 ------------------- ... 341-ath9k-report-tx-status-on-EOSP.patch} | 0 ...ix-block-ack-window-tracking-issues.patch} | 13 +++--- ...BA-on-unexpected-BlockAck-data-fram.patch} | 0 ...elBA-on-unexpected-BlockAck-Request.patch} | 0 ...rder-sensitive-TX-handlers-to-after.patch} | 0 6 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 package/kernel/mac80211/patches/341-ath9k-release-PS-buffered-frames-as-A-MPDU-if-enable.patch rename package/kernel/mac80211/patches/{342-ath9k-report-tx-status-on-EOSP.patch => 341-ath9k-report-tx-status-on-EOSP.patch} (100%) rename package/kernel/mac80211/patches/{343-ath9k-fix-block-ack-window-tracking-issues.patch => 342-ath9k-fix-block-ack-window-tracking-issues.patch} (94%) rename package/kernel/mac80211/patches/{344-mac80211-send-delBA-on-unexpected-BlockAck-data-fram.patch => 343-mac80211-send-delBA-on-unexpected-BlockAck-data-fram.patch} (100%) rename package/kernel/mac80211/patches/{345-mac80211-send-delBA-on-unexpected-BlockAck-Request.patch => 344-mac80211-send-delBA-on-unexpected-BlockAck-Request.patch} (100%) rename package/kernel/mac80211/patches/{346-mac80211-Move-reorder-sensitive-TX-handlers-to-after.patch => 345-mac80211-Move-reorder-sensitive-TX-handlers-to-after.patch} (100%) 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 index 1cc1667a71..0000000000 --- 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 -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 ---- - ---- 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 007a8d7d62..fea147b182 100644 --- 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 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 -- 2.30.2