aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-05-05 14:31:38 -0400
committerReinette Chatre <reinette.chatre@intel.com>2010-06-06 02:16:30 -0400
commitf8525e553210a1545615bde5b203b1913470079f (patch)
tree94fe569e6fd78f3d93eb050abe5f00f6518db8c5 /drivers/net
parent79d07325502e73508f917475bc1617b60979dd94 (diff)
iwlwifi: beacon internal time unit
use TIME_UNIT define for beacon internal calculation Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index 718ffa3d89c..56bcf0ebec8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -506,11 +506,11 @@ void iwl_setup_rxon_timing(struct iwl_priv *priv, struct ieee80211_vif *vif)
506 } 506 }
507 507
508 beacon_int = iwl_adjust_beacon_interval(beacon_int, 508 beacon_int = iwl_adjust_beacon_interval(beacon_int,
509 priv->hw_params.max_beacon_itrvl * 1024); 509 priv->hw_params.max_beacon_itrvl * TIME_UNIT);
510 priv->rxon_timing.beacon_interval = cpu_to_le16(beacon_int); 510 priv->rxon_timing.beacon_interval = cpu_to_le16(beacon_int);
511 511
512 tsf = priv->timestamp; /* tsf is modifed by do_div: copy it */ 512 tsf = priv->timestamp; /* tsf is modifed by do_div: copy it */
513 interval_tm = beacon_int * 1024; 513 interval_tm = beacon_int * TIME_UNIT;
514 rem = do_div(tsf, interval_tm); 514 rem = do_div(tsf, interval_tm);
515 priv->rxon_timing.beacon_init_val = cpu_to_le32(interval_tm - rem); 515 priv->rxon_timing.beacon_init_val = cpu_to_le32(interval_tm - rem);
516 516