diff options
author | Zhu Yi <yi.zhu@intel.com> | 2008-06-30 05:23:31 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-07-02 15:48:32 -0400 |
commit | 5225640bbe397fea3f38031c53641aaaf11115a8 (patch) | |
tree | 5034139fb100910b83b8205768d01a8e34b2dcb1 /drivers/net/wireless/iwlwifi/iwl-4965.c | |
parent | 914233d68f07d5d9c22630cd5a84fdfd98f39da2 (diff) |
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: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index e4eab5196b7f..8c93f8d56a70 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -1879,21 +1879,9 @@ static int iwl4965_is_temp_calib_needed(struct iwl_priv *priv) | |||
1879 | return 1; | 1879 | return 1; |
1880 | } | 1880 | } |
1881 | 1881 | ||
1882 | static void iwl4965_temperature_calib(struct iwl_priv *priv, | 1882 | static void iwl4965_temperature_calib(struct iwl_priv *priv) |
1883 | struct iwl_notif_statistics *stats) | ||
1884 | { | 1883 | { |
1885 | s32 temp; | 1884 | s32 temp; |
1886 | int change = ((priv->statistics.general.temperature != | ||
1887 | stats->general.temperature) || | ||
1888 | ((priv->statistics.flag & | ||
1889 | STATISTICS_REPLY_FLG_FAT_MODE_MSK) != | ||
1890 | (stats->flag & STATISTICS_REPLY_FLG_FAT_MODE_MSK))); | ||
1891 | |||
1892 | /* If the hardware hasn't reported a change in | ||
1893 | * temperature then don't bother computing a | ||
1894 | * calibrated temperature value */ | ||
1895 | if (!change) | ||
1896 | return; | ||
1897 | 1885 | ||
1898 | temp = iwl4965_hw_get_temperature(priv); | 1886 | temp = iwl4965_hw_get_temperature(priv); |
1899 | if (temp < 0) | 1887 | if (temp < 0) |