|
@@ -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;
|
|
|
}
|
|
|
|