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

Commit e2ab758d authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'wireless-next-2.6' of... 

Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
parents 95f84f29 f8f79a5d

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

+4 −3
Original line number Diff line number Diff line
@@ -533,9 +533,10 @@ int iwlagn_send_tx_power(struct iwl_priv *priv) 


void iwlagn_temperature(struct iwl_priv *priv)

{

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

	priv->temperature =

		le32_to_cpu(priv->_agn.statistics.general.common.temperature);

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

	priv->temperature = le32_to_cpu((iwl_bt_statistics(priv)) ?

		priv->_agn.statistics_bt.general.common.temperature :

		priv->_agn.statistics.general.common.temperature);

	iwl_tt_handler(priv);

}