diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-14 13:16:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-14 13:16:51 -0700 |
| commit | dd5030404695d81792a21cba575e02b21a2f275a (patch) | |
| tree | 3444db9d86b9a9c325066fd5fd2bc62397f1a04a /drivers/net/wireless/iwlegacy/iwl4965-base.c | |
| parent | 38a2f37258f9e2ae3f6e4241e01088be8dfaf4e9 (diff) | |
| parent | 332704a51498a7e29aa92c19dc03f11f80b71bfe (diff) | |
| download | op-kernel-dev-dd5030404695d81792a21cba575e02b21a2f275a.zip op-kernel-dev-dd5030404695d81792a21cba575e02b21a2f275a.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl4965-base.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl4965-base.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl4965-base.c b/drivers/net/wireless/iwlegacy/iwl4965-base.c index 91b3d8b..d484c36 100644 --- a/drivers/net/wireless/iwlegacy/iwl4965-base.c +++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c @@ -3140,12 +3140,6 @@ static int iwl4965_init_drv(struct iwl_priv *priv) iwl_legacy_init_scan_params(priv); - /* Set the tx_power_user_lmt to the lowest power level - * this value will get overwritten by channel max power avg - * from eeprom */ - priv->tx_power_user_lmt = IWL4965_TX_POWER_TARGET_POWER_MIN; - priv->tx_power_next = IWL4965_TX_POWER_TARGET_POWER_MIN; - ret = iwl_legacy_init_channel_map(priv); if (ret) { IWL_ERR(priv, "initializing regulatory failed: %d\n", ret); |
