diff options
| author | Wey-Yi Guy | 2009-08-21 22:34:16 +0200 |
|---|---|---|
| committer | John W. Linville | 2009-08-28 20:40:37 +0200 |
| commit | dc1b09733215e19f6a0f676be2744fe2f5471d85 (patch) | |
| tree | 7ac98fdca213399ee6187b4f1f36b5b0a2b4d075 /drivers/net/wireless/iwlwifi/iwl-core.c | |
| parent | iwlwifi: do not allow set tx power over channel power limit (diff) | |
| download | kernel-qcow2-linux-dc1b09733215e19f6a0f676be2744fe2f5471d85.tar.gz kernel-qcow2-linux-dc1b09733215e19f6a0f676be2744fe2f5471d85.tar.xz kernel-qcow2-linux-dc1b09733215e19f6a0f676be2744fe2f5471d85.zip | |
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 faafcaeae0a6..82dadd043b8f 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) geo_ch->flags |= ch->ht40_extension_channel; - if (ch->max_power_avg > priv->tx_power_channel_lmt) - priv->tx_power_channel_lmt = ch->max_power_avg; + if (ch->max_power_avg > priv->tx_power_device_lmt) + priv->tx_power_device_lmt = ch->max_power_avg; } else { geo_ch->flags |= IEEE80211_CHAN_DISABLED; } @@ -1708,10 +1708,10 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force) return -EINVAL; } - if (tx_power > priv->tx_power_channel_lmt) { + if (tx_power > priv->tx_power_device_lmt) { IWL_WARN(priv, "Requested user TXPOWER %d above upper limit %d.\n", - tx_power, priv->tx_power_channel_lmt); + tx_power, priv->tx_power_device_lmt); return -EINVAL; } |