FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-27 20:07:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ath9k_htc: move DEFAULT_SWBA_RESPONSE check to ath9k_htc_beacon_init

Browse Source 
... to remove some more dups.

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Oleksij Rempel 2014-03-01 21:16:06 +01:00 committed by John W. Linville
parent 4b2d841f5b
commit 5f667642f4
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
View File

@ -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);
}