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/htc_drv_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/htc_drv_beacon.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c index aa6a73118706..57fe22b24247 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); |