diff options
Diffstat (limited to 'package/kernel/mac80211/patches/300-pending_work.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/300-pending_work.patch | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch index 5c7f7e0019..90dd5e779f 100644 --- a/package/kernel/mac80211/patches/300-pending_work.patch +++ b/package/kernel/mac80211/patches/300-pending_work.patch @@ -1,3 +1,21 @@ +commit eefb1d6adc4c60d219182b8917e4567484ce07fc +Author: Felix Fietkau <nbd@openwrt.org> +Date: Mon Apr 28 18:27:41 2014 +0200 + + ath9k: remove tid->paused flag + + There are some corner cases where the driver could get stuck with a full + tid queue that is paused, leading to a software tx queue hang. + + Since the tx queueing rework, pausing per-tid queues on aggregation + session setup is no longer necessary. The driver will assign sequence + numbers to buffered frames when a new session is established, in order + to get the correct starting sequence number. + + mac80211 prevents new frames from entering the queue during setup. + + Signed-off-by: Felix Fietkau <nbd@openwrt.org> + commit 98a713933d8495f4078f561c1e651b738dd5b531 Author: Felix Fietkau <nbd@openwrt.org> Date: Sun Apr 27 14:49:03 2014 +0200 @@ -137,3 +155,85 @@ Date: Sun Apr 6 23:35:28 2014 +0200 if (ah->opmode == NL80211_IFTYPE_STATION && BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_LOW && immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI) +--- a/drivers/net/wireless/ath/ath9k/ath9k.h ++++ b/drivers/net/wireless/ath/ath9k/ath9k.h +@@ -251,7 +251,6 @@ struct ath_atx_tid { + + s8 bar_index; + bool sched; +- bool paused; + bool active; + }; + +--- a/drivers/net/wireless/ath/ath9k/xmit.c ++++ b/drivers/net/wireless/ath/ath9k/xmit.c +@@ -107,9 +107,6 @@ static void ath_tx_queue_tid(struct ath_ + { + struct ath_atx_ac *ac = tid->ac; + +- if (tid->paused) +- return; +- + if (tid->sched) + return; + +@@ -1407,7 +1404,6 @@ int ath_tx_aggr_start(struct ath_softc * + ath_tx_tid_change_state(sc, txtid); + + txtid->active = true; +- txtid->paused = true; + *ssn = txtid->seq_start = txtid->seq_next; + txtid->bar_index = -1; + +@@ -1427,7 +1423,6 @@ void ath_tx_aggr_stop(struct ath_softc * + + ath_txq_lock(sc, txq); + txtid->active = false; +- txtid->paused = false; + ath_tx_flush_tid(sc, txtid); + ath_tx_tid_change_state(sc, txtid); + ath_txq_unlock_complete(sc, txq); +@@ -1487,7 +1482,7 @@ void ath_tx_aggr_wakeup(struct ath_softc + ath_txq_lock(sc, txq); + ac->clear_ps_filter = true; + +- if (!tid->paused && ath_tid_has_buffered(tid)) { ++ if (ath_tid_has_buffered(tid)) { + ath_tx_queue_tid(txq, tid); + ath_txq_schedule(sc, txq); + } +@@ -1510,7 +1505,6 @@ void ath_tx_aggr_resume(struct ath_softc + ath_txq_lock(sc, txq); + + tid->baw_size = IEEE80211_MIN_AMPDU_BUF << sta->ht_cap.ampdu_factor; +- tid->paused = false; + + if (ath_tid_has_buffered(tid)) { + ath_tx_queue_tid(txq, tid); +@@ -1544,8 +1538,6 @@ void ath9k_release_buffered_frames(struc + continue; + + tid = ATH_AN_2_TID(an, i); +- if (tid->paused) +- continue; + + ath_txq_lock(sc, tid->ac->txq); + while (nframes > 0) { +@@ -1844,9 +1836,6 @@ void ath_txq_schedule(struct ath_softc * + list_del(&tid->list); + tid->sched = false; + +- if (tid->paused) +- continue; +- + if (ath_tx_sched_aggr(sc, txq, tid, &stop)) + sent = true; + +@@ -2698,7 +2687,6 @@ void ath_tx_node_init(struct ath_softc * + tid->baw_size = WME_MAX_BA; + tid->baw_head = tid->baw_tail = 0; + tid->sched = false; +- tid->paused = false; + tid->active = false; + __skb_queue_head_init(&tid->buf_q); + __skb_queue_head_init(&tid->retry_q); |