diff options
author | Rajkumar Manoharan <rmanoharan@atheros.com> | 2011-05-20 08:22:11 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-01 15:12:28 -0400 |
commit | f29f5c0882bdd58c42b8176ee0b578f92589fda2 (patch) | |
tree | 4824389326bef856b15a73f9d9a5d93c1bafdc97 /drivers/net/wireless/ath/ath9k/beacon.c | |
parent | 9d75ef0f8f6d2e31ed940b3057a42a25f07076fb (diff) |
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: Rajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/beacon.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/beacon.c | 6 |
1 files changed, 3 insertions, 3 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; |