Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7197924 authored by Oleksij Rempel's avatar Oleksij Rempel Committed by John W. Linville
Browse files

ath9k_htc: use ath9k_htc_beacon_init in ath9k_htc_beacon_config_adhoc 



Signed-off-by: default avatarOleksij Rempel <linux@rempel-privat.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4a4495a5

drivers/net/wireless/ath/ath9k/htc_drv_beacon.c

+12 −19
Original line number Diff line number Diff line
@@ -152,16 +152,13 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv, 
static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv,

					  struct ath_beacon_config *bss_conf)

{

	struct ath_common *common = ath9k_hw_common(priv->ah);

	enum ath9k_int imask = 0;

	u32 nexttbtt, intval, tsftu;

	__be32 htc_imask = 0;

	int ret __attribute__ ((unused));

	u8 cmd_rsp;

	struct ath_hw *ah = priv->ah;

	struct ath_common *common = ath9k_hw_common(ah);

	u32 tsftu;

	u64 tsf;



	intval = bss_conf->beacon_interval;

	nexttbtt = intval;

	bss_conf->intval = bss_conf->beacon_interval;

	bss_conf->nexttbtt = bss_conf->intval;



	/*

	 * Pull nexttbtt forward to reflect the current TSF.
@@ -169,30 +166,26 @@ static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv, 
	tsf = ath9k_hw_gettsf64(priv->ah);

	tsftu = TSF_TO_TU(tsf >> 32, tsf) + FUDGE;

	do {

		nexttbtt += intval;

	} while (nexttbtt < tsftu);

		bss_conf->nexttbtt += bss_conf->intval;

	} while (bss_conf->nexttbtt < tsftu);



	/*

	 * Only one IBSS interfce is allowed.

	 */

	if (intval > DEFAULT_SWBA_RESPONSE)

	if (bss_conf->intval > DEFAULT_SWBA_RESPONSE)

		priv->ah->config.sw_beacon_response_time = DEFAULT_SWBA_RESPONSE;

	else

		priv->ah->config.sw_beacon_response_time = MIN_SWBA_RESPONSE;



	if (bss_conf->enable_beacon)

		imask |= ATH9K_INT_SWBA;

		ah->imask = ATH9K_INT_SWBA;



	ath_dbg(common, CONFIG,

		"IBSS Beacon config, intval: %d, nexttbtt: %u, resp_time: %d, imask: 0x%x\n",

		bss_conf->beacon_interval, nexttbtt,

		priv->ah->config.sw_beacon_response_time, imask);

		bss_conf->beacon_interval, bss_conf->nexttbtt,

		priv->ah->config.sw_beacon_response_time, ah->imask);



	WMI_CMD(WMI_DISABLE_INTR_CMDID);

	ath9k_hw_beaconinit(priv->ah, TU_TO_USEC(nexttbtt), TU_TO_USEC(intval));

	priv->beacon.bmisscnt = 0;

	htc_imask = cpu_to_be32(imask);

	WMI_CMD_BUF(WMI_ENABLE_INTR_CMDID, &htc_imask);

	ath9k_htc_beacon_init(priv, bss_conf, bss_conf->ibss_creator);

}



void ath9k_htc_beaconep(void *drv_priv, struct sk_buff *skb,