Commit 08f2d58d authored Aug 21, 2009 by Wey-Yi Guy Committed by John W. Linville Aug 28, 2009

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>

parent 02eec9c5

drivers/net/wireless/iwlwifi/iwl-core.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -1708,10 +1708,10 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)
		return -EINVAL;
		}

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