aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2010-10-22 17:04:26 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-11-15 13:24:24 -0500
commita25a66ac94db88190653d5725c563e3f8faeee61 (patch)
tree8ab28f02619472cb2c989629ded2045e5f9ccfc9 /drivers/net/wireless/iwlwifi/iwl3945-base.c
parent4cbf1b12491cd43032846acc6c6924d9090fa19f (diff)
downloadkernel_samsung_smdk4412-a25a66ac94db88190653d5725c563e3f8faeee61.zip
kernel_samsung_smdk4412-a25a66ac94db88190653d5725c563e3f8faeee61.tar.gz
kernel_samsung_smdk4412-a25a66ac94db88190653d5725c563e3f8faeee61.tar.bz2
iwlwifi: fix set_tx_power vs scan
According to comment in iwl_bg_scan_completed, setting tx power should be deferred during pending scan, but we are not doing this. This patch change code to really defer setting tx power after scan complete. Additionally refactor iwl_set_tx_power code and call lib->send_tx_power() directly from iwlagn_commit_rxon. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 8f8c4b7..a754291 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -3866,6 +3866,7 @@ static int iwl3945_init_drv(struct iwl_priv *priv)
priv->missed_beacon_threshold = IWL_MISSED_BEACON_THRESHOLD_DEF;
priv->tx_power_user_lmt = IWL_DEFAULT_TX_POWER;
+ priv->tx_power_next = IWL_DEFAULT_TX_POWER;
if (eeprom->version < EEPROM_3945_EEPROM_VERSION) {
IWL_WARN(priv, "Unsupported EEPROM version: 0x%04X\n",