aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/ath/363-ath9k-fix-block-ack-window-tracking-issues.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-09-23 18:02:35 +0200
committerJohn Crispin <john@phrozen.org>2018-09-26 16:39:44 +0200
commitdb90c243a0b9bd72fc691cd09e58a96ac2a452cf (patch)
tree50896a95c2bb146907b5d40bb561d541994cade0 /package/kernel/mac80211/patches/ath/363-ath9k-fix-block-ack-window-tracking-issues.patch
parent61b5b4971e7d6aab6b0695997c3b5aaf73c53b5f (diff)
downloadupstream-db90c243a0b9bd72fc691cd09e58a96ac2a452cf.tar.gz
upstream-db90c243a0b9bd72fc691cd09e58a96ac2a452cf.tar.bz2
upstream-db90c243a0b9bd72fc691cd09e58a96ac2a452cf.zip
mac80211: update to version based on 4.19-rc4
This updates mac80211 to backports based on kernel 4.19-rc4. I plan to integrate all the patches which are in this tar into upstream backports soon. I used the backports generated from this code: https://github.com/hauke/backports/commits/wip2 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/ath/363-ath9k-fix-block-ack-window-tracking-issues.patch')
-rw-r--r--package/kernel/mac80211/patches/ath/363-ath9k-fix-block-ack-window-tracking-issues.patch114
1 files changed, 0 insertions, 114 deletions
diff --git a/package/kernel/mac80211/patches/ath/363-ath9k-fix-block-ack-window-tracking-issues.patch b/package/kernel/mac80211/patches/ath/363-ath9k-fix-block-ack-window-tracking-issues.patch
deleted file mode 100644
index e25e92dda9..0000000000
--- a/package/kernel/mac80211/patches/ath/363-ath9k-fix-block-ack-window-tracking-issues.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 30 Aug 2016 12:44:08 +0200
-Subject: [PATCH] ath9k: fix block-ack window tracking issues
-
-Ensure that a buffer gets tracked as part of the block-ack window as
-soon as it's dequeued from the tid for the first time. Ensure that
-double calls to ath_tx_addto_baw (e.g. on retransmission) don't cause
-any issues.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
-
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -62,7 +62,7 @@ static void ath_tx_rc_status(struct ath_
- struct ath_tx_status *ts, int nframes, int nbad,
- int txok);
- static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
-- int seqno);
-+ struct ath_buf *bf);
- static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,
- struct ath_txq *txq,
- struct ath_atx_tid *tid,
-@@ -296,7 +296,7 @@ static void ath_tx_flush_tid(struct ath_
- }
-
- if (fi->baw_tracked) {
-- ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
-+ ath_tx_update_baw(sc, tid, bf);
- sendbar = true;
- }
-
-@@ -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,
-- int seqno)
-+ struct ath_buf *bf)
- {
-+ struct ath_frame_info *fi = get_frame_info(bf->bf_mpdu);
-+ u16 seqno = bf->bf_state.seqno;
- int index, cindex;
-
-+ if (!fi->baw_tracked)
-+ return;
-+
- index = ATH_BA_INDEX(tid->seq_start, seqno);
- cindex = (tid->baw_head + index) & (ATH_TID_MAX_BUFS - 1);
-
-@@ -336,6 +341,9 @@ static void ath_tx_addto_baw(struct ath_
- u16 seqno = bf->bf_state.seqno;
- int index, cindex;
-
-+ if (fi->baw_tracked)
-+ return;
-+
- index = ATH_BA_INDEX(tid->seq_start, seqno);
- cindex = (tid->baw_head + index) & (ATH_TID_MAX_BUFS - 1);
- __set_bit(cindex, tid->tx_buf);
-@@ -612,7 +620,7 @@ static void ath_tx_complete_aggr(struct
- * complete the acked-ones/xretried ones; update
- * block-ack window
- */
-- ath_tx_update_baw(sc, tid, seqno);
-+ ath_tx_update_baw(sc, tid, bf);
-
- if (rc_update && (acked_cnt == 1 || txfail_cnt == 1)) {
- memcpy(tx_info->control.rates, rates, sizeof(rates));
-@@ -642,7 +650,7 @@ static void ath_tx_complete_aggr(struct
- * run out of tx buf.
- */
- if (!tbf) {
-- ath_tx_update_baw(sc, tid, seqno);
-+ ath_tx_update_baw(sc, tid, bf);
-
- ath_tx_complete_buf(sc, bf, txq,
- &bf_head, NULL, ts,
-@@ -1011,11 +1019,14 @@ ath_tx_get_tid_subframe(struct ath_softc
-
- INIT_LIST_HEAD(&bf_head);
- list_add(&bf->list, &bf_head);
-- ath_tx_update_baw(sc, tid, seqno);
-+ ath_tx_update_baw(sc, tid, bf);
- ath_tx_complete_buf(sc, bf, txq, &bf_head, NULL, &ts, 0);
- continue;
- }
-
-+ if (bf_isampdu(bf))
-+ ath_tx_addto_baw(sc, tid, bf);
-+
- return bf;
- }
-
-@@ -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 */
-- if (!fi->baw_tracked)
-- ath_tx_addto_baw(sc, tid, bf);
- bf->bf_state.ndelim = ndelim;
-
- list_add_tail(&bf->list, bf_q);
-@@ -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);
-- if (bf_isampdu(bf)) {
-- ath_tx_addto_baw(sc, tid, bf);
-+ if (bf_isampdu(bf))
- bf->bf_state.bf_type &= ~BUF_AGGR;
-- }
- if (bf_tail)
- bf_tail->bf_next = bf;
-