diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-10-22 17:04:29 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-15 19:24:28 +0100 |
| commit | ac4f5457c7617999967e9740f8903b922714bab4 (patch) | |
| tree | df5de5ef19760787c2707f1f3d2534506c8f5787 /drivers/net/wireless/iwlwifi/iwl-scan.c | |
| parent | iwlwifi: avoid commit rxon during scan in iwlagn_bt_traffic_change_work (diff) | |
| download | linux-ac4f5457c7617999967e9740f8903b922714bab4.tar.xz linux-ac4f5457c7617999967e9740f8903b922714bab4.zip | |
iwlwifi: defer update power mode while scan
Do not set power mode when scanning, and defer that when scan finish.
We still set power mode in force case i.e. when device is overheated.
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/iwl-scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index d63e30e1106a..e1aa0e1daa5a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -607,6 +607,7 @@ out_settings: * We do not commit power settings while scan is pending, * do it now if the settings changed. */ + iwl_power_set_mode(priv, &priv->power_data.sleep_cmd_next, false); iwl_set_tx_power(priv, priv->tx_power_next, false); priv->cfg->ops->utils->post_scan(priv); |