summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorOleksij Rempel <linux@rempel-privat.de>2014-03-01 21:16:06 +0100
committerJohn W. Linville <linville@tuxdriver.com>2014-03-17 13:13:09 -0400
commit5f667642f4b290b04d88d5ca926fba81fed6180d (patch)
treef6ce88b4d324121a506f283dcb2f52caa6300333 /drivers
parent4b2d841f5bc3143f5a019b6a441c19bf2986bdf4 (diff)
ath9k_htc: move DEFAULT_SWBA_RESPONSE check to ath9k_htc_beacon_init
... to remove some more dups. Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath9k/htc_drv_beacon.c22
1 files changed, 5 insertions, 17 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
index cbaf4e0429f0..e8b6ec3c1dbb 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
@@ -74,6 +74,11 @@ static void ath9k_htc_beacon_init(struct ath9k_htc_priv *priv,
__be32 htc_imask = 0;
u8 cmd_rsp;
+ if (conf->intval >= TU_TO_USEC(DEFAULT_SWBA_RESPONSE))
+ ah->config.sw_beacon_response_time = DEFAULT_SWBA_RESPONSE;
+ else
+ ah->config.sw_beacon_response_time = MIN_SWBA_RESPONSE;
+
WMI_CMD(WMI_DISABLE_INTR_CMDID);
if (reset_tsf)
ath9k_hw_reset_tsf(ah);
@@ -110,15 +115,6 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv,
ah->imask = 0;
ath9k_cmn_beacon_config_ap(ah, conf, ATH9K_HTC_MAX_BCN_VIF);
- /*
- * To reduce beacon misses under heavy TX load,
- * set the beacon response time to a larger value.
- */
- if (conf->intval >= TU_TO_USEC(DEFAULT_SWBA_RESPONSE))
- ah->config.sw_beacon_response_time = DEFAULT_SWBA_RESPONSE;
- else
- ah->config.sw_beacon_response_time = MIN_SWBA_RESPONSE;
-
ath9k_htc_beacon_init(priv, conf, false);
}
@@ -129,14 +125,6 @@ static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv,
ah->imask = 0;
ath9k_cmn_beacon_config_adhoc(ah, conf);
- /*
- * Only one IBSS interfce is allowed.
- */
- if (conf->intval >= TU_TO_USEC(DEFAULT_SWBA_RESPONSE))
- ah->config.sw_beacon_response_time = DEFAULT_SWBA_RESPONSE;
- else
- ah->config.sw_beacon_response_time = MIN_SWBA_RESPONSE;
-
ath9k_htc_beacon_init(priv, conf, conf->ibss_creator);
}