diff options
-rw-r--r-- | drivers/net/wireless/ath/ath9k/beacon.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 1 |
4 files changed, 10 insertions, 11 deletions
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c index d4d8ceced89..8b85d7c1d38 100644 --- a/drivers/net/wireless/ath/ath9k/beacon.c +++ b/drivers/net/wireless/ath/ath9k/beacon.c | |||
@@ -496,7 +496,7 @@ static void ath_beacon_config_ap(struct ath_softc *sc, | |||
496 | u32 nexttbtt, intval; | 496 | u32 nexttbtt, intval; |
497 | 497 | ||
498 | /* NB: the beacon interval is kept internally in TU's */ | 498 | /* NB: the beacon interval is kept internally in TU's */ |
499 | intval = TU_TO_USEC(conf->beacon_interval & ATH9K_BEACON_PERIOD); | 499 | intval = TU_TO_USEC(conf->beacon_interval); |
500 | intval /= ATH_BCBUF; /* for staggered beacons */ | 500 | intval /= ATH_BCBUF; /* for staggered beacons */ |
501 | nexttbtt = intval; | 501 | nexttbtt = intval; |
502 | 502 | ||
@@ -543,7 +543,7 @@ static void ath_beacon_config_sta(struct ath_softc *sc, | |||
543 | } | 543 | } |
544 | 544 | ||
545 | memset(&bs, 0, sizeof(bs)); | 545 | memset(&bs, 0, sizeof(bs)); |
546 | intval = conf->beacon_interval & ATH9K_BEACON_PERIOD; | 546 | intval = conf->beacon_interval; |
547 | 547 | ||
548 | /* | 548 | /* |
549 | * Setup dtim and cfp parameters according to | 549 | * Setup dtim and cfp parameters according to |
@@ -657,7 +657,7 @@ static void ath_beacon_config_adhoc(struct ath_softc *sc, | |||
657 | ath9k_reset_beacon_status(sc); | 657 | ath9k_reset_beacon_status(sc); |
658 | 658 | ||
659 | tsf = ath9k_hw_gettsf32(ah) + TU_TO_USEC(FUDGE); | 659 | tsf = ath9k_hw_gettsf32(ah) + TU_TO_USEC(FUDGE); |
660 | intval = TU_TO_USEC(conf->beacon_interval & ATH9K_BEACON_PERIOD); | 660 | intval = TU_TO_USEC(conf->beacon_interval); |
661 | 661 | ||
662 | if (!sc->beacon.bc_tstamp) | 662 | if (!sc->beacon.bc_tstamp) |
663 | nexttbtt = tsf + intval; | 663 | nexttbtt = tsf + intval; |
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c index aa6a7311870..57fe22b2424 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | |||
@@ -79,7 +79,7 @@ static void ath9k_htc_beacon_config_sta(struct ath9k_htc_priv *priv, | |||
79 | 79 | ||
80 | memset(&bs, 0, sizeof(bs)); | 80 | memset(&bs, 0, sizeof(bs)); |
81 | 81 | ||
82 | intval = bss_conf->beacon_interval & ATH9K_BEACON_PERIOD; | 82 | intval = bss_conf->beacon_interval; |
83 | bmiss_timeout = (ATH_DEFAULT_BMISS_LIMIT * bss_conf->beacon_interval); | 83 | bmiss_timeout = (ATH_DEFAULT_BMISS_LIMIT * bss_conf->beacon_interval); |
84 | 84 | ||
85 | /* | 85 | /* |
@@ -194,7 +194,7 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv, | |||
194 | u8 cmd_rsp; | 194 | u8 cmd_rsp; |
195 | u64 tsf; | 195 | u64 tsf; |
196 | 196 | ||
197 | intval = bss_conf->beacon_interval & ATH9K_BEACON_PERIOD; | 197 | intval = bss_conf->beacon_interval; |
198 | intval /= ATH9K_HTC_MAX_BCN_VIF; | 198 | intval /= ATH9K_HTC_MAX_BCN_VIF; |
199 | nexttbtt = intval; | 199 | nexttbtt = intval; |
200 | 200 | ||
@@ -250,7 +250,7 @@ static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv, | |||
250 | u8 cmd_rsp; | 250 | u8 cmd_rsp; |
251 | u64 tsf; | 251 | u64 tsf; |
252 | 252 | ||
253 | intval = bss_conf->beacon_interval & ATH9K_BEACON_PERIOD; | 253 | intval = bss_conf->beacon_interval; |
254 | nexttbtt = intval; | 254 | nexttbtt = intval; |
255 | 255 | ||
256 | /* | 256 | /* |
@@ -427,7 +427,7 @@ static int ath9k_htc_choose_bslot(struct ath9k_htc_priv *priv, | |||
427 | u16 intval; | 427 | u16 intval; |
428 | int slot; | 428 | int slot; |
429 | 429 | ||
430 | intval = priv->cur_beacon_conf.beacon_interval & ATH9K_BEACON_PERIOD; | 430 | intval = priv->cur_beacon_conf.beacon_interval; |
431 | 431 | ||
432 | tsf = be64_to_cpu(swba->tsf); | 432 | tsf = be64_to_cpu(swba->tsf); |
433 | tsftu = TSF_TO_TU(tsf >> 32, tsf); | 433 | tsftu = TSF_TO_TU(tsf >> 32, tsf); |
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 1be7c8bbef8..6de2655e07d 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -1785,16 +1785,16 @@ void ath9k_hw_set_sta_beacon_timers(struct ath_hw *ah, | |||
1785 | REG_WRITE(ah, AR_NEXT_TBTT_TIMER, TU_TO_USEC(bs->bs_nexttbtt)); | 1785 | REG_WRITE(ah, AR_NEXT_TBTT_TIMER, TU_TO_USEC(bs->bs_nexttbtt)); |
1786 | 1786 | ||
1787 | REG_WRITE(ah, AR_BEACON_PERIOD, | 1787 | REG_WRITE(ah, AR_BEACON_PERIOD, |
1788 | TU_TO_USEC(bs->bs_intval & ATH9K_BEACON_PERIOD)); | 1788 | TU_TO_USEC(bs->bs_intval)); |
1789 | REG_WRITE(ah, AR_DMA_BEACON_PERIOD, | 1789 | REG_WRITE(ah, AR_DMA_BEACON_PERIOD, |
1790 | TU_TO_USEC(bs->bs_intval & ATH9K_BEACON_PERIOD)); | 1790 | TU_TO_USEC(bs->bs_intval)); |
1791 | 1791 | ||
1792 | REGWRITE_BUFFER_FLUSH(ah); | 1792 | REGWRITE_BUFFER_FLUSH(ah); |
1793 | 1793 | ||
1794 | REG_RMW_FIELD(ah, AR_RSSI_THR, | 1794 | REG_RMW_FIELD(ah, AR_RSSI_THR, |
1795 | AR_RSSI_THR_BM_THR, bs->bs_bmissthreshold); | 1795 | AR_RSSI_THR_BM_THR, bs->bs_bmissthreshold); |
1796 | 1796 | ||
1797 | beaconintval = bs->bs_intval & ATH9K_BEACON_PERIOD; | 1797 | beaconintval = bs->bs_intval; |
1798 | 1798 | ||
1799 | if (bs->bs_sleepduration > beaconintval) | 1799 | if (bs->bs_sleepduration > beaconintval) |
1800 | beaconintval = bs->bs_sleepduration; | 1800 | beaconintval = bs->bs_sleepduration; |
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index d8381785413..6a6fb543983 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -403,7 +403,6 @@ struct ath9k_beacon_state { | |||
403 | u32 bs_nexttbtt; | 403 | u32 bs_nexttbtt; |
404 | u32 bs_nextdtim; | 404 | u32 bs_nextdtim; |
405 | u32 bs_intval; | 405 | u32 bs_intval; |
406 | #define ATH9K_BEACON_PERIOD 0x0000ffff | ||
407 | #define ATH9K_TSFOOR_THRESHOLD 0x00004240 /* 16k us */ | 406 | #define ATH9K_TSFOOR_THRESHOLD 0x00004240 /* 16k us */ |
408 | u32 bs_dtimperiod; | 407 | u32 bs_dtimperiod; |
409 | u16 bs_cfpperiod; | 408 | u16 bs_cfpperiod; |