diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index 1f3305b36d05..fe907f353368 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
@@ -1675,7 +1675,7 @@ static void iwl3945_hw_reg_set_scan_power(struct iwl_priv *priv, u32 scan_tbl_in | |||
1675 | /* further limit to user's max power preference. | 1675 | /* further limit to user's max power preference. |
1676 | * FIXME: Other spectrum management power limitations do not | 1676 | * FIXME: Other spectrum management power limitations do not |
1677 | * seem to apply?? */ | 1677 | * seem to apply?? */ |
1678 | power = min(power, priv->user_txpower_limit); | 1678 | power = min(power, priv->tx_power_user_lmt); |
1679 | scan_power_info->requested_power = power; | 1679 | scan_power_info->requested_power = power; |
1680 | 1680 | ||
1681 | /* find difference between new scan *power* and current "normal" | 1681 | /* find difference between new scan *power* and current "normal" |
@@ -1947,14 +1947,14 @@ int iwl3945_hw_reg_set_txpower(struct iwl_priv *priv, s8 power) | |||
1947 | u8 a_band; | 1947 | u8 a_band; |
1948 | u8 i; | 1948 | u8 i; |
1949 | 1949 | ||
1950 | if (priv->user_txpower_limit == power) { | 1950 | if (priv->tx_power_user_lmt == power) { |
1951 | IWL_DEBUG_POWER("Requested Tx power same as current " | 1951 | IWL_DEBUG_POWER("Requested Tx power same as current " |
1952 | "limit: %ddBm.\n", power); | 1952 | "limit: %ddBm.\n", power); |
1953 | return 0; | 1953 | return 0; |
1954 | } | 1954 | } |
1955 | 1955 | ||
1956 | IWL_DEBUG_POWER("Setting upper limit clamp to %ddBm.\n", power); | 1956 | IWL_DEBUG_POWER("Setting upper limit clamp to %ddBm.\n", power); |
1957 | priv->user_txpower_limit = power; | 1957 | priv->tx_power_user_lmt = power; |
1958 | 1958 | ||
1959 | /* set up new Tx powers for each and every channel, 2.4 and 5.x */ | 1959 | /* set up new Tx powers for each and every channel, 2.4 and 5.x */ |
1960 | 1960 | ||