iwlwifi: do not allow set tx power over channel power limit

When setting tx power in sysfs, check against max channel tx power
limit instead of IWL_TX_POWER_TARGET_POWER_MAX.

Different devices have different max tx power limit; using
IWL_TX_POWER_TARGET_POWER_MAX can excess the limitaion and give wrong
information.

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:15 -07:00 коммит произвёл John W. Linville
Родитель 02eec9c5a1
Коммит 08f2d58d0e
1 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -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 > IWL_TX_POWER_TARGET_POWER_MAX) { if (tx_power > priv->tx_power_channel_lmt) {
IWL_WARN(priv, "Requested user TXPOWER %d above upper limit %d.\n", IWL_WARN(priv,
tx_power, "Requested user TXPOWER %d above upper limit %d.\n",
IWL_TX_POWER_TARGET_POWER_MAX); tx_power, priv->tx_power_channel_lmt);
return -EINVAL; return -EINVAL;
} }