From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Thu, 24 Apr 2008 18:55:29 +0000 (-0700)
Subject: iwlwifi-5000: update the CT-Kill value for 5000 series
X-Git-Tag: v2.6.27-rc1~969^2~467
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c031bf806fef4854b02266a4105f55ed31f2d1a8;p=linux-2.6-omap-h63xx.git

iwlwifi-5000: update the CT-Kill value for 5000 series

This patch upadtes the CT-Kill value for 5000 series.

Signed-off-by: Assaf Krauss <assaf.krauss@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 545970b0caa..7c42bbffff5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -181,6 +181,21 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)
 						IWL_ANTENNA_AUX | 0x04);
 		break;
 	}
+
+	switch (priv->hw_rev & CSR_HW_REV_TYPE_MSK) {
+	case CSR_HW_REV_TYPE_5100:
+	case CSR_HW_REV_TYPE_5300:
+		/* 5X00 wants in Celsius */
+		priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD;
+		break;
+	case CSR_HW_REV_TYPE_5150:
+	case CSR_HW_REV_TYPE_5350:
+		/* 5X50 wants in Kelvin */
+		priv->hw_params.ct_kill_threshold =
+				CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD);
+		break;
+	}
+
 	return 0;
 }
 static struct iwl_hcmd_ops iwl5000_hcmd = {