uhttpd: finish inherited uloop in forked childs, fixes misdispatched events leading...
[openwrt/staging/jow.git] / package / mac80211 / patches / 573-ath9k_ani_fix_mode_checks.patch
1 --- a/drivers/net/wireless/ath/ath9k/ani.c
2 +++ b/drivers/net/wireless/ath/ath9k/ani.c
3 @@ -176,7 +176,7 @@ static void ath9k_hw_ani_ofdm_err_trigge
4 }
5 }
6
7 - if (ah->opmode == NL80211_IFTYPE_AP) {
8 + if (ah->opmode != NL80211_IFTYPE_STATION) {
9 if (aniState->firstepLevel < HAL_FIRST_STEP_MAX) {
10 ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
11 aniState->firstepLevel + 1);
12 @@ -236,7 +236,7 @@ static void ath9k_hw_ani_cck_err_trigger
13 return;
14 }
15 }
16 - if (ah->opmode == NL80211_IFTYPE_AP) {
17 + if (ah->opmode != NL80211_IFTYPE_STATION) {
18 if (aniState->firstepLevel < HAL_FIRST_STEP_MAX) {
19 ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
20 aniState->firstepLevel + 1);
21 @@ -335,8 +335,7 @@ static void ath9k_hw_set_cck_nil(struct
22 BEACON_RSSI(ah), aniState->rssiThrLow,
23 aniState->rssiThrHigh);
24
25 - if ((ah->opmode == NL80211_IFTYPE_STATION ||
26 - ah->opmode == NL80211_IFTYPE_ADHOC) &&
27 + if (ah->opmode == NL80211_IFTYPE_STATION &&
28 BEACON_RSSI(ah) <= aniState->rssiThrLow &&
29 immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)
30 immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;
31 @@ -390,7 +389,7 @@ static void ath9k_hw_ani_lower_immunity_
32
33 aniState = &ah->curchan->ani;
34
35 - if (ah->opmode == NL80211_IFTYPE_AP) {
36 + if (ah->opmode != NL80211_IFTYPE_STATION) {
37 if (aniState->firstepLevel > 0) {
38 if (ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
39 aniState->firstepLevel - 1))
40 @@ -474,8 +473,7 @@ static void ath9k_ani_reset_old(struct a
41
42 aniState = &ah->curchan->ani;
43
44 - if (ah->opmode != NL80211_IFTYPE_STATION
45 - && ah->opmode != NL80211_IFTYPE_ADHOC) {
46 + if (ah->opmode != NL80211_IFTYPE_STATION) {
47 ath_dbg(common, ANI, "Reset ANI state opmode %u\n", ah->opmode);
48 ah->stats.ast_ani_reset++;
49