Commit 5225640b authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

iwlwifi: fix iwl4965 temperature callback calibration issue 



The patch fixes the temperature calibration issue introduced by the
patch "iwlwifi: move RX stats to core, and move temperature to handler".
It also remove the second parameter "stats" since it is already copied
to priv->statistics.

Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 914233d6

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

+1 −13
Original line number Diff line number Diff line
@@ -1879,21 +1879,9 @@ static int iwl4965_is_temp_calib_needed(struct iwl_priv *priv) 
	return 1;

}



static void iwl4965_temperature_calib(struct iwl_priv *priv,

				      struct iwl_notif_statistics *stats)

static void iwl4965_temperature_calib(struct iwl_priv *priv)

{

	s32 temp;

	int change = ((priv->statistics.general.temperature !=

		   stats->general.temperature) ||

		  ((priv->statistics.flag &

		    STATISTICS_REPLY_FLG_FAT_MODE_MSK) !=

		   (stats->flag & STATISTICS_REPLY_FLG_FAT_MODE_MSK)));



	/* If the hardware hasn't reported a change in

	 * temperature then don't bother computing a

	 * calibrated temperature value */

	if (!change)

		return;



	temp = iwl4965_hw_get_temperature(priv);

	if (temp < 0)

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

+2 −3
Original line number Diff line number Diff line
@@ -1422,11 +1422,10 @@ static int iwl5000_send_tx_power(struct iwl_priv *priv) 
				       NULL);

}



static void iwl5000_temperature(struct iwl_priv *priv,

				struct iwl_notif_statistics *stats)

static void iwl5000_temperature(struct iwl_priv *priv)

{

	/* store temperature from statistics (in Celsius) */

	priv->temperature = le32_to_cpu(stats->general.temperature);

	priv->temperature = le32_to_cpu(priv->statistics.general.temperature);

}



static struct iwl_hcmd_ops iwl5000_hcmd = {

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

+1 −2
Original line number Diff line number Diff line
@@ -140,8 +140,7 @@ struct iwl_lib_ops { 
	int (*set_power)(struct iwl_priv *priv, void *cmd);

	int (*send_tx_power) (struct iwl_priv *priv);

	void (*update_chain_flags)(struct iwl_priv *priv);

	void (*temperature) (struct iwl_priv *priv,

		struct iwl_notif_statistics *stats);

	void (*temperature) (struct iwl_priv *priv);

	/* eeprom operations (as defined in iwl-eeprom.h) */

	struct iwl_eeprom_ops eeprom_ops;

};

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

+9 −2
Original line number Diff line number Diff line
@@ -557,11 +557,18 @@ static void iwl_rx_calc_noise(struct iwl_priv *priv) 
void iwl_rx_statistics(struct iwl_priv *priv,

			      struct iwl_rx_mem_buffer *rxb)

{

	int change;

	struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data;



	IWL_DEBUG_RX("Statistics notification received (%d vs %d).\n",

		     (int)sizeof(priv->statistics), pkt->len);



	change = ((priv->statistics.general.temperature !=

		   pkt->u.stats.general.temperature) ||

		  ((priv->statistics.flag &

		    STATISTICS_REPLY_FLG_FAT_MODE_MSK) !=

		   (pkt->u.stats.flag & STATISTICS_REPLY_FLG_FAT_MODE_MSK)));



	memcpy(&priv->statistics, &pkt->u.stats, sizeof(priv->statistics));



	set_bit(STATUS_STATISTICS, &priv->status);
@@ -581,8 +588,8 @@ void iwl_rx_statistics(struct iwl_priv *priv, 


	iwl_leds_background(priv);



	if (priv->cfg->ops->lib->temperature)

		priv->cfg->ops->lib->temperature(priv, &pkt->u.stats);

	if (priv->cfg->ops->lib->temperature && change)

		priv->cfg->ops->lib->temperature(priv);

}

EXPORT_SYMBOL(iwl_rx_statistics);