diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-09-20 12:12:31 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-10-06 11:11:27 -0400 |
commit | ab63c68adaabb670f0513d5b63f3b233b16ea8b4 (patch) | |
tree | dc752f08f0781058e258d89f5d53ad1f850d675c /drivers/net | |
parent | 7cb1b0887fcc61918e3d64827fbef968bb67a57a (diff) |
iwlagn: rename iwl5000_tx_power_dbm_cmd
iwl5000_tx_power_dbm_cmd really should be iwlagn_tx_power_dbm_cmd,
so rename it.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-commands.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c index 29ed6049c0f7..48c48f1fac37 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c | |||
@@ -491,7 +491,7 @@ int iwlagn_hw_valid_rtc_data_addr(u32 addr) | |||
491 | 491 | ||
492 | int iwlagn_send_tx_power(struct iwl_priv *priv) | 492 | int iwlagn_send_tx_power(struct iwl_priv *priv) |
493 | { | 493 | { |
494 | struct iwl5000_tx_power_dbm_cmd tx_power_cmd; | 494 | struct iwlagn_tx_power_dbm_cmd tx_power_cmd; |
495 | u8 tx_ant_cfg_cmd; | 495 | u8 tx_ant_cfg_cmd; |
496 | 496 | ||
497 | /* half dBm need to multiply */ | 497 | /* half dBm need to multiply */ |
@@ -512,8 +512,8 @@ int iwlagn_send_tx_power(struct iwl_priv *priv) | |||
512 | */ | 512 | */ |
513 | tx_power_cmd.global_lmt = priv->tx_power_lmt_in_half_dbm; | 513 | tx_power_cmd.global_lmt = priv->tx_power_lmt_in_half_dbm; |
514 | } | 514 | } |
515 | tx_power_cmd.flags = IWL50_TX_POWER_NO_CLOSED; | 515 | tx_power_cmd.flags = IWLAGN_TX_POWER_NO_CLOSED; |
516 | tx_power_cmd.srv_chan_lmt = IWL50_TX_POWER_AUTO; | 516 | tx_power_cmd.srv_chan_lmt = IWLAGN_TX_POWER_AUTO; |
517 | 517 | ||
518 | if (IWL_UCODE_API(priv->ucode_ver) == 1) | 518 | if (IWL_UCODE_API(priv->ucode_ver) == 1) |
519 | tx_ant_cfg_cmd = REPLY_TX_POWER_DBM_CMD_V1; | 519 | tx_ant_cfg_cmd = REPLY_TX_POWER_DBM_CMD_V1; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h index 27350eebb132..16dda2dce615 100644 --- a/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-commands.h | |||
@@ -420,12 +420,12 @@ struct iwl4965_tx_power_db { | |||
420 | 420 | ||
421 | /** | 421 | /** |
422 | * Command REPLY_TX_POWER_DBM_CMD = 0x98 | 422 | * Command REPLY_TX_POWER_DBM_CMD = 0x98 |
423 | * struct iwl5000_tx_power_dbm_cmd | 423 | * struct iwlagn_tx_power_dbm_cmd |
424 | */ | 424 | */ |
425 | #define IWL50_TX_POWER_AUTO 0x7f | 425 | #define IWLAGN_TX_POWER_AUTO 0x7f |
426 | #define IWL50_TX_POWER_NO_CLOSED (0x1 << 6) | 426 | #define IWLAGN_TX_POWER_NO_CLOSED (0x1 << 6) |
427 | 427 | ||
428 | struct iwl5000_tx_power_dbm_cmd { | 428 | struct iwlagn_tx_power_dbm_cmd { |
429 | s8 global_lmt; /*in half-dBm (e.g. 30 = 15 dBm) */ | 429 | s8 global_lmt; /*in half-dBm (e.g. 30 = 15 dBm) */ |
430 | u8 flags; | 430 | u8 flags; |
431 | s8 srv_chan_lmt; /*in half-dBm (e.g. 30 = 15 dBm) */ | 431 | s8 srv_chan_lmt; /*in half-dBm (e.g. 30 = 15 dBm) */ |