aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-3945.c
diff options
context:
space:
mode:
authorSamuel Ortiz <samuel.ortiz@intel.com>2009-01-23 16:45:11 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 16:01:32 -0500
commit75bcfae97d71756263ccbffc2dcdd8b3020a1a0f (patch)
tree48249318907ef79703593a27cee4490a13ca5b5b /drivers/net/wireless/iwlwifi/iwl-3945.c
parent7b841727d2715d97592f46164804b34d6241644f (diff)
iwl3945: Define send_tx_power
We can define this iwl_lib ops for 3945, as this would help us cleaning the scanning code. Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 4aeb101fc45b..602a3a915684 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -1705,12 +1705,12 @@ static void iwl3945_hw_reg_set_scan_power(struct iwl_priv *priv, u32 scan_tbl_in
1705} 1705}
1706 1706
1707/** 1707/**
1708 * iwl3945_hw_reg_send_txpower - fill in Tx Power command with gain settings 1708 * iwl3945_send_tx_power - fill in Tx Power command with gain settings
1709 * 1709 *
1710 * Configures power settings for all rates for the current channel, 1710 * Configures power settings for all rates for the current channel,
1711 * using values from channel info struct, and send to NIC 1711 * using values from channel info struct, and send to NIC
1712 */ 1712 */
1713int iwl3945_hw_reg_send_txpower(struct iwl_priv *priv) 1713int iwl3945_send_tx_power(struct iwl_priv *priv)
1714{ 1714{
1715 int rate_idx, i; 1715 int rate_idx, i;
1716 const struct iwl_channel_info *ch_info = NULL; 1716 const struct iwl_channel_info *ch_info = NULL;
@@ -1935,7 +1935,7 @@ static int iwl3945_hw_reg_comp_txpower_temp(struct iwl_priv *priv)
1935 } 1935 }
1936 1936
1937 /* send Txpower command for current channel to ucode */ 1937 /* send Txpower command for current channel to ucode */
1938 return iwl3945_hw_reg_send_txpower(priv); 1938 return priv->cfg->ops->lib->send_tx_power(priv);
1939} 1939}
1940 1940
1941int iwl3945_hw_reg_set_txpower(struct iwl_priv *priv, s8 power) 1941int iwl3945_hw_reg_set_txpower(struct iwl_priv *priv, s8 power)
@@ -2712,6 +2712,7 @@ static struct iwl_lib_ops iwl3945_lib = {
2712 .config = iwl3945_nic_config, 2712 .config = iwl3945_nic_config,
2713 .set_pwr_src = iwl3945_set_pwr_src, 2713 .set_pwr_src = iwl3945_set_pwr_src,
2714 }, 2714 },
2715 .send_tx_power = iwl3945_send_tx_power,
2715}; 2716};
2716 2717
2717static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = { 2718static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = {