1 commit eefb1d6adc4c60d219182b8917e4567484ce07fc
2 Author: Felix Fietkau <nbd@openwrt.org>
3 Date: Mon Apr 28 18:27:41 2014 +0200
5 ath9k: remove tid->paused flag
7 There are some corner cases where the driver could get stuck with a full
8 tid queue that is paused, leading to a software tx queue hang.
10 Since the tx queueing rework, pausing per-tid queues on aggregation
11 session setup is no longer necessary. The driver will assign sequence
12 numbers to buffered frames when a new session is established, in order
13 to get the correct starting sequence number.
15 mac80211 prevents new frames from entering the queue during setup.
17 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
19 commit 98a713933d8495f4078f561c1e651b738dd5b531
20 Author: Felix Fietkau <nbd@openwrt.org>
21 Date: Sun Apr 27 14:49:03 2014 +0200
23 ath9k_hw: do not lower ANI setting below default on AR913x
25 When the amount of noise fluctuates strongly, low immunity settings
26 can sometimes disrupt signal detection on AR913x chips. When that
27 happens, no OFDM/CCK errors are reported anymore, and ANI tunes the
28 radio to the lowest immunity settings.
29 Usually rx/tx fails as well in that case.
31 To fix this, keep noise immunity settings at or above ANI default level,
32 which will keep radio parameters at or above INI values.
34 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
36 commit 7cbb4c021bfd1e656f5b9953a947ab3c64e4e3b0
37 Author: Felix Fietkau <nbd@openwrt.org>
38 Date: Thu Apr 10 10:49:01 2014 +0200
40 mac80211: exclude AP_VLAN interfaces from tx power calculation
42 Their power value is initialized to zero. This patch fixes an issue
43 where the configured power drops to the minimum value when AP_VLAN
44 interfaces are created/removed.
46 Cc: stable@vger.kernel.org
47 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
49 commit 0ca13e26341733bf9577287fb04a3bef0d2f5cc9
50 Author: Felix Fietkau <nbd@openwrt.org>
51 Date: Wed Apr 9 00:07:01 2014 +0200
53 mac80211: suppress BSS info change notifications for AP_VLAN
55 Fixes warnings on tx power changes
57 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
59 commit ec998e5991781ecdaad0911dc64f1c8d3749c308
60 Author: Felix Fietkau <nbd@openwrt.org>
61 Date: Tue Apr 8 23:42:17 2014 +0200
63 ath9k: fix a scheduling while atomic bug in CSA handling
65 Commit "ath9k: prepare for multi-interface CSA support" added a call to
66 ieee80211_iterate_active_interfaces in atomic context (beacon tasklet),
68 Use ieee80211_iterate_active_interfaces_atomic instead.
70 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
72 commit 93f310a38a1d81a4bc8fcd9bf29628bd721cf2ef
73 Author: Felix Fietkau <nbd@openwrt.org>
74 Date: Sun Apr 6 23:35:28 2014 +0200
76 ath9k_hw: reduce ANI firstep range for older chips
78 Use 0-8 instead of 0-16, which is closer to the old implementation.
79 Also drop the overwrite of the firstep_low parameter to improve
82 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
85 --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
86 +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
87 @@ -1004,11 +1004,9 @@ static bool ar5008_hw_ani_control_new(st
88 case ATH9K_ANI_FIRSTEP_LEVEL:{
93 REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
94 AR_PHY_FIND_SIG_FIRSTEP, value);
95 - REG_RMW_FIELD(ah, AR_PHY_FIND_SIG_LOW,
96 - AR_PHY_FIND_SIG_FIRSTEP_LOW, value);
98 if (level != aniState->firstepLevel) {
100 --- a/drivers/net/wireless/ath/ath9k/beacon.c
101 +++ b/drivers/net/wireless/ath/ath9k/beacon.c
102 @@ -312,10 +312,9 @@ static void ath9k_csa_update_vif(void *d
104 void ath9k_csa_update(struct ath_softc *sc)
106 - ieee80211_iterate_active_interfaces(sc->hw,
107 - IEEE80211_IFACE_ITER_NORMAL,
108 - ath9k_csa_update_vif,
110 + ieee80211_iterate_active_interfaces_atomic(sc->hw,
111 + IEEE80211_IFACE_ITER_NORMAL,
112 + ath9k_csa_update_vif, sc);
115 void ath9k_beacon_tasklet(unsigned long data)
116 --- a/net/mac80211/main.c
117 +++ b/net/mac80211/main.c
118 @@ -152,6 +152,8 @@ static u32 ieee80211_hw_conf_chan(struct
119 list_for_each_entry_rcu(sdata, &local->interfaces, list) {
120 if (!rcu_access_pointer(sdata->vif.chanctx_conf))
122 + if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
124 power = min(power, sdata->vif.bss_conf.txpower);
127 @@ -203,7 +205,7 @@ void ieee80211_bss_info_change_notify(st
129 struct ieee80211_local *local = sdata->local;
132 + if (!changed || sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
135 drv_bss_info_changed(local, sdata, &sdata->vif.bss_conf, changed);
136 --- a/drivers/net/wireless/ath/ath9k/ani.c
137 +++ b/drivers/net/wireless/ath/ath9k/ani.c
138 @@ -155,6 +155,9 @@ static void ath9k_hw_set_ofdm_nil(struct
139 ATH9K_ANI_RSSI_THR_LOW,
140 ATH9K_ANI_RSSI_THR_HIGH);
142 + if (AR_SREV_9100(ah) && immunityLevel < ATH9K_ANI_OFDM_DEF_LEVEL)
143 + immunityLevel = ATH9K_ANI_OFDM_DEF_LEVEL;
146 aniState->ofdmNoiseImmunityLevel = immunityLevel;
148 @@ -235,6 +238,9 @@ static void ath9k_hw_set_cck_nil(struct
149 BEACON_RSSI(ah), ATH9K_ANI_RSSI_THR_LOW,
150 ATH9K_ANI_RSSI_THR_HIGH);
152 + if (AR_SREV_9100(ah) && immunityLevel < ATH9K_ANI_CCK_DEF_LEVEL)
153 + immunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;
155 if (ah->opmode == NL80211_IFTYPE_STATION &&
156 BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_LOW &&
157 immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)
158 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
159 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
160 @@ -251,7 +251,6 @@ struct ath_atx_tid {
168 --- a/drivers/net/wireless/ath/ath9k/xmit.c
169 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
170 @@ -107,9 +107,6 @@ static void ath_tx_queue_tid(struct ath_
172 struct ath_atx_ac *ac = tid->ac;
180 @@ -1407,7 +1404,6 @@ int ath_tx_aggr_start(struct ath_softc *
181 ath_tx_tid_change_state(sc, txtid);
183 txtid->active = true;
184 - txtid->paused = true;
185 *ssn = txtid->seq_start = txtid->seq_next;
186 txtid->bar_index = -1;
188 @@ -1427,7 +1423,6 @@ void ath_tx_aggr_stop(struct ath_softc *
190 ath_txq_lock(sc, txq);
191 txtid->active = false;
192 - txtid->paused = false;
193 ath_tx_flush_tid(sc, txtid);
194 ath_tx_tid_change_state(sc, txtid);
195 ath_txq_unlock_complete(sc, txq);
196 @@ -1487,7 +1482,7 @@ void ath_tx_aggr_wakeup(struct ath_softc
197 ath_txq_lock(sc, txq);
198 ac->clear_ps_filter = true;
200 - if (!tid->paused && ath_tid_has_buffered(tid)) {
201 + if (ath_tid_has_buffered(tid)) {
202 ath_tx_queue_tid(txq, tid);
203 ath_txq_schedule(sc, txq);
205 @@ -1510,7 +1505,6 @@ void ath_tx_aggr_resume(struct ath_softc
206 ath_txq_lock(sc, txq);
208 tid->baw_size = IEEE80211_MIN_AMPDU_BUF << sta->ht_cap.ampdu_factor;
209 - tid->paused = false;
211 if (ath_tid_has_buffered(tid)) {
212 ath_tx_queue_tid(txq, tid);
213 @@ -1544,8 +1538,6 @@ void ath9k_release_buffered_frames(struc
216 tid = ATH_AN_2_TID(an, i);
220 ath_txq_lock(sc, tid->ac->txq);
221 while (nframes > 0) {
222 @@ -1844,9 +1836,6 @@ void ath_txq_schedule(struct ath_softc *
223 list_del(&tid->list);
229 if (ath_tx_sched_aggr(sc, txq, tid, &stop))
232 @@ -2698,7 +2687,6 @@ void ath_tx_node_init(struct ath_softc *
233 tid->baw_size = WME_MAX_BA;
234 tid->baw_head = tid->baw_tail = 0;
236 - tid->paused = false;
238 __skb_queue_head_init(&tid->buf_q);
239 __skb_queue_head_init(&tid->retry_q);