leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
This commit is contained in:
Liu Hong 2005-07-13 12:29:21 -05:00 committed by James Ketrenos
parent 25b645be1e
commit f75459e6f6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/wireless/ipw2100.c
View File

@ -5102,6 +5102,10 @@ static int ipw2100_set_tx_power(struct ipw2100_priv *priv, u32 tx_power)
}; };
int err = 0; 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; cmd.host_command_parameters[0] = tx_power;
if (priv->ieee->iw_mode == IW_MODE_ADHOC) if (priv->ieee->iw_mode == IW_MODE_ADHOC)
@ -7523,8 +7527,7 @@ static int ipw2100_wx_set_txpow(struct net_device *dev,
wrqu->txpower.value > IPW_TX_POWER_MAX_DBM) wrqu->txpower.value > IPW_TX_POWER_MAX_DBM)
return -EINVAL; return -EINVAL;
value = (wrqu->txpower.value - IPW_TX_POWER_MIN_DBM) * 16 / value = wrqu->txpower.value;
(IPW_TX_POWER_MAX_DBM - IPW_TX_POWER_MIN_DBM);
} }
down(&priv->action_sem); down(&priv->action_sem);
@ -7564,11 +7567,7 @@ static int ipw2100_wx_get_txpow(struct net_device *dev,
} else { } else {
wrqu->power.disabled = 0; wrqu->power.disabled = 0;
wrqu->power.fixed = 1; wrqu->power.fixed = 1;
wrqu->power.value = wrqu->power.value = priv->tx_power;
(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.flags = IW_TXPOW_DBM; wrqu->power.flags = IW_TXPOW_DBM;