49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
--- a/drivers/net/wireless/ath/ath9k/ani.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/ani.c
|
|
@@ -176,7 +176,7 @@ static void ath9k_hw_ani_ofdm_err_trigge
|
|
}
|
|
}
|
|
|
|
- if (ah->opmode == NL80211_IFTYPE_AP) {
|
|
+ if (ah->opmode != NL80211_IFTYPE_STATION) {
|
|
if (aniState->firstepLevel < HAL_FIRST_STEP_MAX) {
|
|
ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
|
|
aniState->firstepLevel + 1);
|
|
@@ -236,7 +236,7 @@ static void ath9k_hw_ani_cck_err_trigger
|
|
return;
|
|
}
|
|
}
|
|
- if (ah->opmode == NL80211_IFTYPE_AP) {
|
|
+ if (ah->opmode != NL80211_IFTYPE_STATION) {
|
|
if (aniState->firstepLevel < HAL_FIRST_STEP_MAX) {
|
|
ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
|
|
aniState->firstepLevel + 1);
|
|
@@ -335,8 +335,7 @@ static void ath9k_hw_set_cck_nil(struct
|
|
BEACON_RSSI(ah), aniState->rssiThrLow,
|
|
aniState->rssiThrHigh);
|
|
|
|
- if ((ah->opmode == NL80211_IFTYPE_STATION ||
|
|
- ah->opmode == NL80211_IFTYPE_ADHOC) &&
|
|
+ if (ah->opmode == NL80211_IFTYPE_STATION &&
|
|
BEACON_RSSI(ah) <= aniState->rssiThrLow &&
|
|
immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)
|
|
immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;
|
|
@@ -390,7 +389,7 @@ static void ath9k_hw_ani_lower_immunity_
|
|
|
|
aniState = &ah->curchan->ani;
|
|
|
|
- if (ah->opmode == NL80211_IFTYPE_AP) {
|
|
+ if (ah->opmode != NL80211_IFTYPE_STATION) {
|
|
if (aniState->firstepLevel > 0) {
|
|
if (ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
|
|
aniState->firstepLevel - 1))
|
|
@@ -474,8 +473,7 @@ static void ath9k_ani_reset_old(struct a
|
|
|
|
aniState = &ah->curchan->ani;
|
|
|
|
- if (ah->opmode != NL80211_IFTYPE_STATION
|
|
- && ah->opmode != NL80211_IFTYPE_ADHOC) {
|
|
+ if (ah->opmode != NL80211_IFTYPE_STATION) {
|
|
ath_dbg(common, ANI, "Reset ANI state opmode %u\n", ah->opmode);
|
|
ah->stats.ast_ani_reset++;
|
|
|