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

Commit f29f5c08 authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k: Remove ATH9K_BEACON_PERIOD mask 



Earlier beacon_interval is used to hold interval value and
some flags (ATH9K_BEACON_ENA &ATH9K_BEACON_PERIOD). So to
extract interval ATH9K_BEACON_PERIOD is used. Those flags
were completely removed. So masking beacon_interval is
not required.

Signed-off-by: default avatarRajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9d75ef0f

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

+3 −3
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ static void ath_beacon_config_ap(struct ath_softc *sc, 
	u32 nexttbtt, intval;



	/* NB: the beacon interval is kept internally in TU's */

	intval = TU_TO_USEC(conf->beacon_interval & ATH9K_BEACON_PERIOD);

	intval = TU_TO_USEC(conf->beacon_interval);

	intval /= ATH_BCBUF;    /* for staggered beacons */

	nexttbtt = intval;
@@ -543,7 +543,7 @@ static void ath_beacon_config_sta(struct ath_softc *sc, 
	}



	memset(&bs, 0, sizeof(bs));

	intval = conf->beacon_interval & ATH9K_BEACON_PERIOD;

	intval = conf->beacon_interval;



	/*

	 * Setup dtim and cfp parameters according to
@@ -657,7 +657,7 @@ static void ath_beacon_config_adhoc(struct ath_softc *sc, 
	ath9k_reset_beacon_status(sc);



	tsf = ath9k_hw_gettsf32(ah) + TU_TO_USEC(FUDGE);

	intval = TU_TO_USEC(conf->beacon_interval & ATH9K_BEACON_PERIOD);

	intval = TU_TO_USEC(conf->beacon_interval);



	if (!sc->beacon.bc_tstamp)

		nexttbtt = tsf + intval;

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

+4 −4
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static void ath9k_htc_beacon_config_sta(struct ath9k_htc_priv *priv, 


	memset(&bs, 0, sizeof(bs));



	intval = bss_conf->beacon_interval & ATH9K_BEACON_PERIOD;

	intval = bss_conf->beacon_interval;

	bmiss_timeout = (ATH_DEFAULT_BMISS_LIMIT * bss_conf->beacon_interval);



	/*
@@ -194,7 +194,7 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv, 
	u8 cmd_rsp;

	u64 tsf;



	intval = bss_conf->beacon_interval & ATH9K_BEACON_PERIOD;

	intval = bss_conf->beacon_interval;

	intval /= ATH9K_HTC_MAX_BCN_VIF;

	nexttbtt = intval;
@@ -250,7 +250,7 @@ static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv, 
	u8 cmd_rsp;

	u64 tsf;



	intval = bss_conf->beacon_interval & ATH9K_BEACON_PERIOD;

	intval = bss_conf->beacon_interval;

	nexttbtt = intval;



	/*
@@ -427,7 +427,7 @@ static int ath9k_htc_choose_bslot(struct ath9k_htc_priv *priv, 
	u16 intval;

	int slot;



	intval = priv->cur_beacon_conf.beacon_interval & ATH9K_BEACON_PERIOD;

	intval = priv->cur_beacon_conf.beacon_interval;



	tsf = be64_to_cpu(swba->tsf);

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

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

+3 −3
Original line number Diff line number Diff line
@@ -1785,16 +1785,16 @@ void ath9k_hw_set_sta_beacon_timers(struct ath_hw *ah, 
	REG_WRITE(ah, AR_NEXT_TBTT_TIMER, TU_TO_USEC(bs->bs_nexttbtt));



	REG_WRITE(ah, AR_BEACON_PERIOD,

		  TU_TO_USEC(bs->bs_intval & ATH9K_BEACON_PERIOD));

		  TU_TO_USEC(bs->bs_intval));

	REG_WRITE(ah, AR_DMA_BEACON_PERIOD,

		  TU_TO_USEC(bs->bs_intval & ATH9K_BEACON_PERIOD));

		  TU_TO_USEC(bs->bs_intval));



	REGWRITE_BUFFER_FLUSH(ah);



	REG_RMW_FIELD(ah, AR_RSSI_THR,

		      AR_RSSI_THR_BM_THR, bs->bs_bmissthreshold);



	beaconintval = bs->bs_intval & ATH9K_BEACON_PERIOD;

	beaconintval = bs->bs_intval;



	if (bs->bs_sleepduration > beaconintval)

		beaconintval = bs->bs_sleepduration;

drivers/net/wireless/ath/ath9k/hw.h

+0 −1
Original line number Diff line number Diff line
@@ -403,7 +403,6 @@ struct ath9k_beacon_state { 
	u32 bs_nexttbtt;

	u32 bs_nextdtim;

	u32 bs_intval;

#define ATH9K_BEACON_PERIOD       0x0000ffff

#define ATH9K_TSFOOR_THRESHOLD    0x00004240 /* 16k us */

	u32 bs_dtimperiod;

	u16 bs_cfpperiod;