projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath9k: merge a few more pending fixes, including a fix for the bogus WARN_ON in pci...
[openwrt.git]
/
package
/
mac80211
/
patches
/
541-ath9k_aggr_queue_cleanup.patch
diff --git
a/package/mac80211/patches/541-ath9k_aggr_queue_cleanup.patch
b/package/mac80211/patches/541-ath9k_aggr_queue_cleanup.patch
index
1ea3c14
..
e196ced
100644
(file)
--- a/
package/mac80211/patches/541-ath9k_aggr_queue_cleanup.patch
+++ b/
package/mac80211/patches/541-ath9k_aggr_queue_cleanup.patch
@@
-160,7
+160,7
@@
if (!an->sleeping)
ath_tx_queue_tid(txq, tid);
spin_unlock_bh(&txq->axq_lock);
if (!an->sleeping)
ath_tx_queue_tid(txq, tid);
spin_unlock_bh(&txq->axq_lock);
-@@ -7
21,19 +722
,22 @@ static enum ATH_AGGR_STATUS ath_tx_form_
+@@ -7
30,19 +731
,22 @@ static enum ATH_AGGR_STATUS ath_tx_form_
int *aggr_len)
{
#define PADBYTES(_len) ((4 - ((_len) % 4)) % 4)
int *aggr_len)
{
#define PADBYTES(_len) ((4 - ((_len) % 4)) % 4)
@@
-188,7
+188,7
@@
/* do not step over block-ack window */
if (!BAW_WITHIN(tid->seq_start, tid->baw_size, fi->seqno)) {
/* do not step over block-ack window */
if (!BAW_WITHIN(tid->seq_start, tid->baw_size, fi->seqno)) {
-@@ -7
84,7 +78
8,9 @@ static enum ATH_AGGR_STATUS ath_tx_form_
+@@ -7
94,7 +79
8,9 @@ static enum ATH_AGGR_STATUS ath_tx_form_
if (!fi->retries)
ath_tx_addto_baw(sc, tid, fi->seqno);
ath9k_hw_set11n_aggr_middle(sc->sc_ah, bf->bf_desc, ndelim);
if (!fi->retries)
ath_tx_addto_baw(sc, tid, fi->seqno);
ath9k_hw_set11n_aggr_middle(sc->sc_ah, bf->bf_desc, ndelim);
@@
-199,7
+199,7
@@
if (bf_prev) {
bf_prev->bf_next = bf;
ath9k_hw_set_desc_link(sc->sc_ah, bf_prev->bf_desc,
if (bf_prev) {
bf_prev->bf_next = bf;
ath9k_hw_set_desc_link(sc->sc_ah, bf_prev->bf_desc,
-@@ -
792,7 +79
8,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_
+@@ -
802,7 +80
8,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_
}
bf_prev = bf;
}
bf_prev = bf;
@@
-208,7
+208,7
@@
*aggr_len = al;
*aggr_len = al;
-@@ -8
10,7 +81
6,7 @@ static void ath_tx_sched_aggr(struct ath
+@@ -8
20,7 +82
6,7 @@ static void ath_tx_sched_aggr(struct ath
int aggr_len;
do {
int aggr_len;
do {
@@
-217,7
+217,7
@@
return;
INIT_LIST_HEAD(&bf_q);
return;
INIT_LIST_HEAD(&bf_q);
-@@ -9
31,7 +93
7,7 @@ bool ath_tx_aggr_sleep(struct ath_softc
+@@ -9
41,7 +94
7,7 @@ bool ath_tx_aggr_sleep(struct ath_softc
spin_lock_bh(&txq->axq_lock);
spin_lock_bh(&txq->axq_lock);
@@
-226,7
+226,7
@@
buffered = true;
tid->sched = false;
buffered = true;
tid->sched = false;
-@@ -9
64,7 +97
0,7 @@ void ath_tx_aggr_wakeup(struct ath_softc
+@@ -9
74,7 +98
0,7 @@ void ath_tx_aggr_wakeup(struct ath_softc
spin_lock_bh(&txq->axq_lock);
ac->clear_ps_filter = true;
spin_lock_bh(&txq->axq_lock);
ac->clear_ps_filter = true;
@@
-235,7
+235,7
@@
ath_tx_queue_tid(txq, tid);
ath_txq_schedule(sc, txq);
}
ath_tx_queue_tid(txq, tid);
ath_txq_schedule(sc, txq);
}
-@@ -13
08,7 +131
4,7 @@ void ath_txq_schedule(struct ath_softc *
+@@ -13
18,7 +132
4,7 @@ void ath_txq_schedule(struct ath_softc *
* add tid to round-robin queue if more frames
* are pending for the tid
*/
* add tid to round-robin queue if more frames
* are pending for the tid
*/
@@
-244,7
+244,7
@@
ath_tx_queue_tid(txq, tid);
if (tid == last_tid ||
ath_tx_queue_tid(txq, tid);
if (tid == last_tid ||
-@@ -14
14,7 +142
0,7 @@ static void ath_tx_send_ampdu(struct ath
+@@ -14
24,7 +143
0,7 @@ static void ath_tx_send_ampdu(struct ath
* - seqno is not within block-ack window
* - h/w queue depth exceeds low water mark
*/
* - seqno is not within block-ack window
* - h/w queue depth exceeds low water mark
*/
@@
-253,7
+253,7
@@
!BAW_WITHIN(tid->seq_start, tid->baw_size, fi->seqno) ||
txctl->txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) {
/*
!BAW_WITHIN(tid->seq_start, tid->baw_size, fi->seqno) ||
txctl->txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) {
/*
-@@ -14
22,7 +142
8,7 @@ static void ath_tx_send_ampdu(struct ath
+@@ -14
32,7 +143
8,7 @@ static void ath_tx_send_ampdu(struct ath
* for aggregation.
*/
TX_STAT_INC(txctl->txq->axq_qnum, a_queued_sw);
* for aggregation.
*/
TX_STAT_INC(txctl->txq->axq_qnum, a_queued_sw);
@@
-262,7
+262,7
@@
if (!txctl->an || !txctl->an->sleeping)
ath_tx_queue_tid(txctl->txq, tid);
return;
if (!txctl->an || !txctl->an->sleeping)
ath_tx_queue_tid(txctl->txq, tid);
return;
-@@ -17
53,6 +175
9,7 @@ static struct ath_buf *ath_tx_setup_buff
+@@ -17
63,6 +176
9,7 @@ static struct ath_buf *ath_tx_setup_buff
bf->bf_buf_addr,
txq->axq_qnum);
bf->bf_buf_addr,
txq->axq_qnum);
@@
-270,7
+270,7
@@
return bf;
}
return bf;
}
-@@ -23
70,7 +237
7,7 @@ void ath_tx_node_init(struct ath_softc *
+@@ -23
80,7 +238
7,7 @@ void ath_tx_node_init(struct ath_softc *
tid->sched = false;
tid->paused = false;
tid->state &= ~AGGR_CLEANUP;
tid->sched = false;
tid->paused = false;
tid->state &= ~AGGR_CLEANUP;
This page took
0.02606 seconds
and
4
git commands to generate.