lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlwifi: name changes from "tx_power_channel_lmt" to "tx_power_device_lmt"

Browse Source 
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>
This commit is contained in:
Wey-Yi Guy
2009-08-21 13:34:16 -07:00
committed by John W. Linville
parent 08f2d58d0e
commit dc1b097332
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/iwlwifi/iwl-core.c
View File

@@ -543,8 +543,8 @@ int iwlcore_init_geos(struct iwl_priv *priv)
geo_ch->flags |= ch->ht40_extension_channel; geo_ch->flags |= ch->ht40_extension_channel;
if (ch->max_power_avg > priv->tx_power_channel_lmt) if (ch->max_power_avg > priv->tx_power_device_lmt)
priv->tx_power_channel_lmt = ch->max_power_avg; priv->tx_power_device_lmt = ch->max_power_avg;
} else { } else {
geo_ch->flags |= IEEE80211_CHAN_DISABLED; 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; return -EINVAL;
} }
if (tx_power > priv->tx_power_channel_lmt) { if (tx_power > priv->tx_power_device_lmt) {
IWL_WARN(priv, IWL_WARN(priv,
"Requested user TXPOWER %d above upper limit %d.\n", "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; return -EINVAL;
} }

2
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@@ -1215,7 +1215,7 @@ struct iwl_priv {
/* TX Power */ /* TX Power */
s8 tx_power_user_lmt; s8 tx_power_user_lmt;
s8 tx_power_channel_lmt; s8 tx_power_device_lmt;
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG