Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drivers/net/wireless/iwlwifi/iwl-1000.c

+0 −2
Original line number Diff line number Diff line
@@ -161,8 +161,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 
	if (priv->cfg->need_dc_calib)

		hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_DC);



	hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;



	return 0;

}

drivers/net/wireless/iwlwifi/iwl-2000.c

+0 −2
Original line number Diff line number Diff line
@@ -159,8 +159,6 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv) 
	if (priv->cfg->need_temp_offset_calib)

		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;

}

drivers/net/wireless/iwlwifi/iwl-5000.c

+0 −4
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) 
		BIT(IWL_CALIB_TX_IQ_PERD)	|

		BIT(IWL_CALIB_BASE_BAND);



	hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;



	return 0;

}
@@ -223,8 +221,6 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv) 
	if (priv->cfg->need_dc_calib)

		hw_params(priv).calib_init_cfg |= BIT(IWL_CALIB_DC);



	hw_params(priv).beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;



	return 0;

}

drivers/net/wireless/iwlwifi/iwl-6000.c

+0 −2
Original line number Diff line number Diff line
@@ -180,8 +180,6 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) 
	if (priv->cfg->need_temp_offset_calib)

		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;

}

drivers/net/wireless/iwlwifi/iwl-core.c

+10 −11
Original line number Diff line number Diff line
@@ -1803,13 +1803,12 @@ u32 iwl_usecs_to_beacons(struct iwl_priv *priv, u32 usec, u32 beacon_interval) 
		return 0;



	quot = (usec / interval) &

		(iwl_beacon_time_mask_high(priv,

		hw_params(priv).beacon_time_tsf_bits) >>

		hw_params(priv).beacon_time_tsf_bits);

		(iwl_beacon_time_mask_high(priv, IWLAGN_EXT_BEACON_TIME_POS) >>

		IWLAGN_EXT_BEACON_TIME_POS);

	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,
@@ -1819,22 +1818,22 @@ __le32 iwl_add_beacon_time(struct iwl_priv *priv, u32 base, 
			   u32 addon, u32 beacon_interval)

{

	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,

				hw_params(priv).beacon_time_tsf_bits);

				IWLAGN_EXT_BEACON_TIME_POS);

	u32 interval = beacon_interval * TIME_UNIT;

	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,

				hw_params(priv).beacon_time_tsf_bits));

				IWLAGN_EXT_BEACON_TIME_POS));



	if (base_low > addon_low)

		res += base_low - addon_low;

	else if (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

		res += (1 << hw_params(priv).beacon_time_tsf_bits);

		res += (1 << IWLAGN_EXT_BEACON_TIME_POS);



	return cpu_to_le32(res);

}