Commit 403ba56a authored by Don Fry's avatar Don Fry Committed by John W. Linville
Browse files

iwlagn: replace beacon_time_fsf_bits variable with #define



All devices use the same value for beacon_time_tsf_bits.  Use the #define
Signed-off-by: default avatarDon Fry <donald.h.fry@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b8c2b05e
...@@ -161,8 +161,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) ...@@ -161,8 +161,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)
if (priv->cfg->need_dc_calib) if (priv->cfg->need_dc_calib)
hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_DC); hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_DC);
hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
return 0; return 0;
} }
......
...@@ -159,8 +159,6 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv) ...@@ -159,8 +159,6 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv)
if (priv->cfg->need_temp_offset_calib) if (priv->cfg->need_temp_offset_calib)
hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_TEMP_OFFSET); hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_TEMP_OFFSET);
hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
return 0; return 0;
} }
......
...@@ -184,8 +184,6 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) ...@@ -184,8 +184,6 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
BIT(IWL_CALIB_TX_IQ_PERD) | BIT(IWL_CALIB_TX_IQ_PERD) |
BIT(IWL_CALIB_BASE_BAND); BIT(IWL_CALIB_BASE_BAND);
hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
return 0; return 0;
} }
...@@ -223,8 +221,6 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv) ...@@ -223,8 +221,6 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv)
if (priv->cfg->need_dc_calib) if (priv->cfg->need_dc_calib)
hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_DC); hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_DC);
hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
return 0; return 0;
} }
......
...@@ -180,8 +180,6 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) ...@@ -180,8 +180,6 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv)
if (priv->cfg->need_temp_offset_calib) if (priv->cfg->need_temp_offset_calib)
hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_TEMP_OFFSET); hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_TEMP_OFFSET);
hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
return 0; return 0;
} }
......
...@@ -1803,13 +1803,12 @@ u32 iwl_usecs_to_beacons(struct iwl_priv *priv, u32 usec, u32 beacon_interval) ...@@ -1803,13 +1803,12 @@ u32 iwl_usecs_to_beacons(struct iwl_priv *priv, u32 usec, u32 beacon_interval)
return 0; return 0;
quot = (usec / interval) & quot = (usec / interval) &
(iwl_beacon_time_mask_high(priv, (iwl_beacon_time_mask_high(priv, IWLAGN_EXT_BEACON_TIME_POS) >>
hw_params(priv).beacon_time_tsf_bits) >> IWLAGN_EXT_BEACON_TIME_POS);
hw_params(priv).beacon_time_tsf_bits);
rem = (usec % interval) & iwl_beacon_time_mask_low(priv, rem = (usec % interval) & iwl_beacon_time_mask_low(priv,
hw_params(priv).beacon_time_tsf_bits); IWLAGN_EXT_BEACON_TIME_POS);
return (quot << hw_params(priv).beacon_time_tsf_bits) + rem; return (quot << IWLAGN_EXT_BEACON_TIME_POS) + rem;
} }
/* base is usually what we get from ucode with each received frame, /* base is usually what we get from ucode with each received frame,
...@@ -1819,22 +1818,22 @@ __le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base, ...@@ -1819,22 +1818,22 @@ __le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base,
u32 addon, u32 beacon_interval) u32 addon, u32 beacon_interval)
{ {
u32 base_low = base & iwl_beacon_time_mask_low(priv, u32 base_low = base & iwl_beacon_time_mask_low(priv,
hw_params(priv).beacon_time_tsf_bits); IWLAGN_EXT_BEACON_TIME_POS);
u32 addon_low = addon & iwl_beacon_time_mask_low(priv, u32 addon_low = addon & iwl_beacon_time_mask_low(priv,
hw_params(priv).beacon_time_tsf_bits); IWLAGN_EXT_BEACON_TIME_POS);
u32 interval = beacon_interval * TIME_UNIT; u32 interval = beacon_interval * TIME_UNIT;
u32 res = (base & iwl_beacon_time_mask_high(priv, u32 res = (base & iwl_beacon_time_mask_high(priv,
hw_params(priv).beacon_time_tsf_bits)) + IWLAGN_EXT_BEACON_TIME_POS)) +
(addon & iwl_beacon_time_mask_high(priv, (addon & iwl_beacon_time_mask_high(priv,
hw_params(priv).beacon_time_tsf_bits)); IWLAGN_EXT_BEACON_TIME_POS));
if (base_low > addon_low) if (base_low > addon_low)
res += base_low - addon_low; res += base_low - addon_low;
else if (base_low < addon_low) { else if (base_low < addon_low) {
res += interval + base_low - addon_low; res += interval + base_low - addon_low;
res += (1 << hw_params(priv).beacon_time_tsf_bits); res += (1 << IWLAGN_EXT_BEACON_TIME_POS);
} else } else
res += (1 << hw_params(priv).beacon_time_tsf_bits); res += (1 << IWLAGN_EXT_BEACON_TIME_POS);
return cpu_to_le32(res); return cpu_to_le32(res);
} }
......
...@@ -167,7 +167,6 @@ struct iwl_mod_params { ...@@ -167,7 +167,6 @@ struct iwl_mod_params {
* @valid_rx_ant: usable antennas for RX * @valid_rx_ant: usable antennas for RX
* @max_stations: the maximal number of stations * @max_stations: the maximal number of stations
* @ht40_channel: is 40MHz width possible: BIT(IEEE80211_BAND_XXX) * @ht40_channel: is 40MHz width possible: BIT(IEEE80211_BAND_XXX)
* @beacon_time_tsf_bits: number of valid tsf bits for beacon time
* @sku: sku read from EEPROM * @sku: sku read from EEPROM
* @rx_page_order: Rx buffer page order * @rx_page_order: Rx buffer page order
* @max_inst_size: for ucode use * @max_inst_size: for ucode use
...@@ -190,7 +189,6 @@ struct iwl_hw_params { ...@@ -190,7 +189,6 @@ struct iwl_hw_params {
u8 max_stations; u8 max_stations;
u8 ht40_channel; u8 ht40_channel;
bool shadow_reg_enable; bool shadow_reg_enable;
u16 beacon_time_tsf_bits;
u16 sku; u16 sku;
u32 rx_page_order; u32 rx_page_order;
u32 max_inst_size; u32 max_inst_size;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment