mac80211: drop 355-ath9k-limit-retries-for-powersave-response-frames.patch

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 363-ath9k-fix-block-ack-window-tracking-issues.patch

diff --git a/package/kernel/mac80211/patches/363-ath9k-fix-block-ack-window-tracking-issues.patch b/package/kernel/mac80211/patches/363-ath9k-fix-block-ack-window-tracking-issues.patch
index 59de1dfe1a2cbdd5b0dd87bf47f963595b3cdb67..e25e92dda9f86dc314cf06ad523d7c1caf8abe9e 100644 (file)
--- a/package/kernel/mac80211/patches/363-ath9k-fix-block-ack-window-tracking-issues.patch
+++ b/package/kernel/mac80211/patches/363-ath9k-fix-block-ack-window-tracking-issues.patch
@@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,
                                           struct ath_txq *txq,
                                           struct ath_atx_tid *tid,
-@@ -311,7 +311,7 @@ static void ath_tx_flush_tid(struct ath_
+@@ -296,7 +296,7 @@ static void ath_tx_flush_tid(struct ath_
                }
  
                if (fi->baw_tracked) {
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                        sendbar = true;
                }
  
-@@ -327,10 +327,15 @@ static void ath_tx_flush_tid(struct ath_
+@@ -312,10 +312,15 @@ static void ath_tx_flush_tid(struct ath_
  }
  
  static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
@@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        index  = ATH_BA_INDEX(tid->seq_start, seqno);
        cindex = (tid->baw_head + index) & (ATH_TID_MAX_BUFS - 1);
  
-@@ -351,6 +356,9 @@ static void ath_tx_addto_baw(struct ath_
+@@ -336,6 +341,9 @@ static void ath_tx_addto_baw(struct ath_
        u16 seqno = bf->bf_state.seqno;
        int index, cindex;
  
@@ -57,7 +57,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        index  = ATH_BA_INDEX(tid->seq_start, seqno);
        cindex = (tid->baw_head + index) & (ATH_TID_MAX_BUFS - 1);
        __set_bit(cindex, tid->tx_buf);
-@@ -627,7 +635,7 @@ static void ath_tx_complete_aggr(struct
+@@ -612,7 +620,7 @@ static void ath_tx_complete_aggr(struct
                         * complete the acked-ones/xretried ones; update
                         * block-ack window
                         */
@@ -66,7 +66,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
                        if (rc_update && (acked_cnt == 1 || txfail_cnt == 1)) {
                                memcpy(tx_info->control.rates, rates, sizeof(rates));
-@@ -657,7 +665,7 @@ static void ath_tx_complete_aggr(struct
+@@ -642,7 +650,7 @@ static void ath_tx_complete_aggr(struct
                                 * run out of tx buf.
                                 */
                                if (!tbf) {
@@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
                                        ath_tx_complete_buf(sc, bf, txq,
                                                            &bf_head, NULL, ts,
-@@ -1026,11 +1034,14 @@ ath_tx_get_tid_subframe(struct ath_softc
+@@ -1011,11 +1019,14 @@ ath_tx_get_tid_subframe(struct ath_softc
  
                        INIT_LIST_HEAD(&bf_head);
                        list_add(&bf->list, &bf_head);
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                return bf;
        }
  
-@@ -1088,8 +1099,6 @@ ath_tx_form_aggr(struct ath_softc *sc, s
+@@ -1073,8 +1084,6 @@ ath_tx_form_aggr(struct ath_softc *sc, s
                bf->bf_next = NULL;
  
                /* link buffers of this frame to the aggregate */
@@ -100,10 +100,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                bf->bf_state.ndelim = ndelim;
  
                list_add_tail(&bf->list, bf_q);
-@@ -1725,10 +1734,8 @@ void ath9k_release_buffered_frames(struc
+@@ -1710,10 +1719,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);
+                       ath_set_rates(tid->an->vif, tid->an->sta, bf);
 -                      if (bf_isampdu(bf)) {
 -                              ath_tx_addto_baw(sc, tid, bf);
 +                      if (bf_isampdu(bf))