aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-04-28 16:35:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-04-28 16:35:25 +0000
commit5c91b4020b626d76d8932e022976f4381d77ff16 (patch)
treecf0623f243380b75525b1212843b6f97362e19c7 /package/kernel/mac80211
parenteccbcc79365b14093075ce47815f256863ac1737 (diff)
downloadupstream-5c91b4020b626d76d8932e022976f4381d77ff16.tar.gz
upstream-5c91b4020b626d76d8932e022976f4381d77ff16.tar.bz2
upstream-5c91b4020b626d76d8932e022976f4381d77ff16.zip
ath9k: add a fix for tx queueing and aggregation
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 40586
Diffstat (limited to 'package/kernel/mac80211')
-rw-r--r--package/kernel/mac80211/patches/300-pending_work.patch100
-rw-r--r--package/kernel/mac80211/patches/530-ath9k_extra_leds.patch6
-rw-r--r--package/kernel/mac80211/patches/552-ath9k_p2p_ps_support.patch6
3 files changed, 106 insertions, 6 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);
diff --git a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
index 5502f02ccc..fb24f03b02 100644
--- a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
+++ b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -555,6 +555,9 @@ static inline int ath9k_dump_btcoex(stru
+@@ -554,6 +554,9 @@ static inline int ath9k_dump_btcoex(stru
void ath_init_leds(struct ath_softc *sc);
void ath_deinit_leds(struct ath_softc *sc);
void ath_fill_led_pin(struct ath_softc *sc);
@@ -10,7 +10,7 @@
#else
static inline void ath_init_leds(struct ath_softc *sc)
{
-@@ -693,6 +696,13 @@ void ath_ant_comb_scan(struct ath_softc
+@@ -692,6 +695,13 @@ void ath_ant_comb_scan(struct ath_softc
#define PS_BEACON_SYNC BIT(4)
#define PS_WAIT_FOR_ANI BIT(5)
@@ -24,7 +24,7 @@
struct ath_softc {
struct ieee80211_hw *hw;
struct device *dev;
-@@ -732,9 +742,8 @@ struct ath_softc {
+@@ -731,9 +741,8 @@ struct ath_softc {
struct ath_beacon beacon;
#ifdef CPTCFG_MAC80211_LEDS
diff --git a/package/kernel/mac80211/patches/552-ath9k_p2p_ps_support.patch b/package/kernel/mac80211/patches/552-ath9k_p2p_ps_support.patch
index fbe5396e6d..1bd0a54112 100644
--- a/package/kernel/mac80211/patches/552-ath9k_p2p_ps_support.patch
+++ b/package/kernel/mac80211/patches/552-ath9k_p2p_ps_support.patch
@@ -178,7 +178,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
#define IEEE80211_SEQ_SEQ_SHIFT 4
#define IEEE80211_SEQ_MAX 4096
#define IEEE80211_WEP_IVLEN 3
-@@ -367,11 +370,15 @@ void ath9k_release_buffered_frames(struc
+@@ -366,11 +369,15 @@ void ath9k_release_buffered_frames(struc
/********/
struct ath_vif {
@@ -194,7 +194,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
};
struct ath9k_vif_iter_data {
-@@ -464,6 +471,8 @@ int ath_update_survey_stats(struct ath_s
+@@ -463,6 +470,8 @@ int ath_update_survey_stats(struct ath_s
void ath_update_survey_nf(struct ath_softc *sc, int channel);
void ath9k_queue_reset(struct ath_softc *sc, enum ath_reset_type type);
void ath_ps_full_sleep(unsigned long data);
@@ -203,7 +203,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/**********/
/* BTCOEX */
-@@ -724,6 +733,9 @@ struct ath_softc {
+@@ -723,6 +732,9 @@ struct ath_softc {
struct completion paprd_complete;
wait_queue_head_t tx_wait;