diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2009-08-21 16:34:16 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-28 14:40:37 -0400 |
commit | dc1b09733215e19f6a0f676be2744fe2f5471d85 (patch) | |
tree | 7ac98fdca213399ee6187b4f1f36b5b0a2b4d075 /drivers/net/wireless/iwlwifi/iwl-core.c | |
parent | 08f2d58d0e573d13a8eb0afbb6f3122da37b9ce3 (diff) |
iwlwifi: name changes from "tx_power_channel_lmt" to "tx_power_device_lmt"
Changing the name from "tx_power_channel_lmt" to "tx_power_device_lmt";
to give idea that scope of limit is for overall device, not any
individual channels
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@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-core.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index faafcaeae0a..82dadd043b8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -543,8 +543,8 @@ int iwlcore_init_geos(struct iwl_priv *priv) | |||
543 | 543 | ||
544 | geo_ch->flags |= ch->ht40_extension_channel; | 544 | geo_ch->flags |= ch->ht40_extension_channel; |
545 | 545 | ||
546 | if (ch->max_power_avg > priv->tx_power_channel_lmt) | 546 | if (ch->max_power_avg > priv->tx_power_device_lmt) |
547 | priv->tx_power_channel_lmt = ch->max_power_avg; | 547 | priv->tx_power_device_lmt = ch->max_power_avg; |
548 | } else { | 548 | } else { |
549 | geo_ch->flags |= IEEE80211_CHAN_DISABLED; | 549 | geo_ch->flags |= IEEE80211_CHAN_DISABLED; |
550 | } | 550 | } |
@@ -1708,10 +1708,10 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force) | |||
1708 | return -EINVAL; | 1708 | return -EINVAL; |
1709 | } | 1709 | } |
1710 | 1710 | ||
1711 | if (tx_power > priv->tx_power_channel_lmt) { | 1711 | if (tx_power > priv->tx_power_device_lmt) { |
1712 | IWL_WARN(priv, | 1712 | IWL_WARN(priv, |
1713 | "Requested user TXPOWER %d above upper limit %d.\n", | 1713 | "Requested user TXPOWER %d above upper limit %d.\n", |
1714 | tx_power, priv->tx_power_channel_lmt); | 1714 | tx_power, priv->tx_power_device_lmt); |
1715 | return -EINVAL; | 1715 | return -EINVAL; |
1716 | } | 1716 | } |
1717 | 1717 | ||