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

Commit ab5c0f1f authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: keep plcp_delta_threshold in priv 



The base_params shouldn't be writable, so keep
a copy of this in priv that can be modified.

Signed-off-by: default avatarJohannes Berg <johannes.berg@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 3cc241ad

drivers/net/wireless/iwlwifi/iwl-agn-rx.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static bool iwlagn_good_plcp_health(struct iwl_priv *priv, 
				 unsigned int msecs)

{

	int delta;

	int threshold = cfg(priv)->base_params->plcp_delta_threshold;

	int threshold = priv->plcp_delta_threshold;



	if (threshold == IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE) {

		IWL_DEBUG_RADIO(priv, "plcp_err check disabled\n");

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

+3 −0
Original line number Diff line number Diff line
@@ -1045,6 +1045,9 @@ static int iwl_init_drv(struct iwl_priv *priv) 
	priv->ieee_rates = NULL;

	priv->band = IEEE80211_BAND_2GHZ;



	priv->plcp_delta_threshold =

		cfg(priv)->base_params->plcp_delta_threshold;



	priv->iw_mode = NL80211_IFTYPE_STATION;

	priv->current_ht_config.smps = IEEE80211_SMPS_STATIC;

	priv->missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF;

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

+3 −3
Original line number Diff line number Diff line
@@ -2241,7 +2241,7 @@ static ssize_t iwl_dbgfs_plcp_delta_read(struct file *file, 
	const size_t bufsz = sizeof(buf);



	pos += scnprintf(buf + pos, bufsz - pos, "%u\n",

			cfg(priv)->base_params->plcp_delta_threshold);

			priv->plcp_delta_threshold);



	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);

}
@@ -2263,10 +2263,10 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file, 
		return -EINVAL;

	if ((plcp < IWL_MAX_PLCP_ERR_THRESHOLD_MIN) ||

		(plcp > IWL_MAX_PLCP_ERR_THRESHOLD_MAX))

		cfg(priv)->base_params->plcp_delta_threshold =

		priv->plcp_delta_threshold =

			IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE;

	else

		cfg(priv)->base_params->plcp_delta_threshold = plcp;

		priv->plcp_delta_threshold = plcp;

	return count;

}

drivers/net/wireless/iwlwifi/iwl-dev.h

+2 −0
Original line number Diff line number Diff line
@@ -770,6 +770,8 @@ struct iwl_priv { 
	struct iwl_channel_info *channel_info;	/* channel info array */

	u8 channel_count;	/* # of channels */



	u8 plcp_delta_threshold;



	/* thermal calibration */

	s32 temperature;	/* Celsius */

	s32 last_temperature;