---

yaml
---
r: 266751
b: refs/heads/master
c: 0b3e6f8
h: refs/heads/master
i:
  266749: 60ac86d
  266747: 98df053
  266743: c6c9c58
  266735: 537730a
  266719: bb1f479
  266687: 4792ac3
  266623: ec94e2f
  266495: 972db11
  266239: 79d1193
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3246c4e6addfbf69b23095b69c5484cd76ddb37b
+refs/heads/master: 0b3e6f861a108dee24e93624b279984e7385012f

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

@@ -43,7 +43,6 @@
 #include "iwl-helpers.h"
 #include "iwl-agn.h"
 #include "iwl-agn-hw.h"
-#include "iwl-5000-hw.h"
 #include "iwl-trans.h"
 #include "iwl-shared.h"
 #include "iwl-cfg.h"
@@ -134,6 +133,21 @@ static struct iwl_sensitivity_ranges iwl5150_sensitivity = {
 	.nrg_th_cca = 62,
 };
 
+#define IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF	(-5)
+
+static s32 iwl_temp_calib_to_offset(struct iwl_priv *priv)
+{
+	u16 temperature, voltage;
+	__le16 *temp_calib = (__le16 *)iwl_eeprom_query_addr(priv,
+				EEPROM_KELVIN_TEMPERATURE);
+
+	temperature = le16_to_cpu(temp_calib[0]);
+	voltage = le16_to_cpu(temp_calib[1]);
+
+	/* offset = temp - volt / coeff */
+	return (s32)(temperature - voltage / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF);
+}
+
 static void iwl5150_set_ct_threshold(struct iwl_priv *priv)
 {
 	const s32 volt2temp_coef = IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF;