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>

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index faafcaeae0a67de097f1610fdb8db50154a535fa..82dadd043b8f481aa4739dba400dc2fc7249b086 100644 (file)
--- 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;
        }
 

diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 0178734499f053a20a8a16aedd5f64e36c4fa63d..ccea2e4ab45a46496daef53d298e610cca4d6ef1 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1215,7 +1215,7 @@ struct iwl_priv {
 
        /* TX Power */
        s8 tx_power_user_lmt;
-       s8 tx_power_channel_lmt;
+       s8 tx_power_device_lmt;
 
 
 #ifdef CONFIG_IWLWIFI_DEBUG