From 325da6ced07cc01e0e7091d746baa3ddf9b7c1fd Mon Sep 17 00:00:00 2001
From: David Spinadel <david.spinadel@intel.com>
Date: Thu, 15 Mar 2012 11:22:31 +0200
Subject: [PATCH] --- yaml --- r: 301031 b: refs/heads/master c:
 cfd8544e9e350848cf580380418cbebcd09015be h: refs/heads/master i:   301029:
 dd466e1b7163285d75c51c08ece79ee68f6116e7   301027:
 e04c85fb47310368ff4d8f611d3892ca24bae69d   301023:
 5f5f61df04c702b5a737228c0ae750f5ac1a5501 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/net/wireless/iwlwifi/iwl-phy-db.c | 20 +++++++++++++++++--
 .../drivers/net/wireless/iwlwifi/iwl-phy-db.h |  6 ++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7cf18e0ee83c..9dc65acb37d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfb45f5422deb3bbf12d8f67f5f76e4b9a7eb766
+refs/heads/master: cfd8544e9e350848cf580380418cbebcd09015be
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-phy-db.c b/trunk/drivers/net/wireless/iwlwifi/iwl-phy-db.c
index d65305d08ebf..1a791af82d15 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-phy-db.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-phy-db.c
@@ -228,8 +228,24 @@ static u16 channel_id_to_papd(u16 ch_id)
 
 static u16 channel_id_to_txp(struct iwl_phy_db *phy_db, u16 ch_id)
 {
-	/* TODO David*/
-	return 0;
+	struct iwl_phy_db_chg_txp *txp_chg;
+	int i;
+	u8 ch_index = ch_id_to_ch_index(ch_id);
+	if (ch_index == 0xff)
+		return 0xff;
+
+	for (i = 0; i < IWL_NUM_TXP_CH_GROUPS; i++) {
+		txp_chg = (void *)phy_db->calib_ch_group_txp[i].data;
+		if (!txp_chg)
+			return 0xff;
+		/*
+		 * Looking for the first channel group that its max channel is
+		 * higher then wanted channel.
+		 */
+		if (le16_to_cpu(txp_chg->max_channel_idx) >= ch_index)
+			return i;
+	}
+	return 0xff;
 }
 
 int iwl_phy_db_get_section_data(struct iwl_phy_db *phy_db,
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-phy-db.h b/trunk/drivers/net/wireless/iwlwifi/iwl-phy-db.h
index ba91a8b28398..5e86305de66a 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-phy-db.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-phy-db.h
@@ -108,6 +108,12 @@ enum iwl_phy_db_section_type {
 	IWL_PHY_DB_MAX
 };
 
+/* for parsing of tx power channel group data that comes from the firmware*/
+struct iwl_phy_db_chg_txp {
+	__le32 space;
+	__le16 max_channel_idx;
+} __packed;
+
 struct iwl_phy_db *iwl_phy_db_init(struct iwl_shared *shrd);
 
 void iwl_phy_db_free(struct iwl_phy_db *phy_db);