commit f75459e6f64ca0632f23029e2ca47b424dd33373
author Liu Hong <hong.liu@intel.com> Wed Jul 13 12:29:21 2005 -0500
committer James Ketrenos <jketreno@linux.intel.com> Mon Nov 07 17:50:06 2005 -0600
tree 4476b0f6df484ed3905de6e12b8802bdfc3c16d4
parent 25b645be1e25e16ea7a25678ac195a0e7595c629

[Bug 339] Fix ipw2100 iwconfig set/get txpower.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>

drivers/net/wireless/ipw2100.c

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index cf5da20..73287ab 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -5102,6 +5102,10 @@
 	};
 	int err = 0;
 
+	if (tx_power != IPW_TX_POWER_DEFAULT)
+		tx_power = (tx_power - IPW_TX_POWER_MIN_DBM) * 16 /
+		    (IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM);
+
 	cmd.host_command_parameters[0] = tx_power;
 
 	if (priv->ieee->iw_mode == IW_MODE_ADHOC)
@@ -7523,8 +7527,7 @@
 		    wrqu->txpower.value > IPW_TX_POWER_MAX_DBM)
 			return -EINVAL;
 
-		value = (wrqu->txpower.value - IPW_TX_POWER_MIN_DBM) * 16 /
-		    (IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM);
+		value = wrqu->txpower.value;
 	}
 
 	down(&priv->action_sem);
@@ -7564,11 +7567,7 @@
 	} else {
 		wrqu->power.disabled = 0;
 		wrqu->power.fixed = 1;
-		wrqu->power.value =
-		    (priv->tx_power *
-		     (IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM)) /
-		    (IPW_TX_POWER_MAX - IPW_TX_POWER_MIN) +
-		    IPW_TX_POWER_MIN_DBM;
+		wrqu->power.value = priv->tx_power;
 	}
 
 	wrqu->power.flags = IW_TXPOW_DBM;