diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-05-27 08:40:24 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-08 14:17:27 -0400 |
| commit | 43e4e0b94984b45d52048e3ac027cac15c718b65 (patch) | |
| tree | 9cc480c690b46262473f94a8cee897637ced9d20 /drivers | |
| parent | 57a27e1d6a3bb9ad4efeebd3a8c71156d6207536 (diff) | |
| download | linux-stable-43e4e0b94984b45d52048e3ac027cac15c718b65.tar.gz linux-stable-43e4e0b94984b45d52048e3ac027cac15c718b65.tar.bz2 linux-stable-43e4e0b94984b45d52048e3ac027cac15c718b65.zip | |
iwlagn: send tx power command if defer cause by RXON not match
During channge channel, tx power will not send to uCode, the tx power command
should send after scan complete. but should also can send after RXON command.
Stable fix identified by Stanislaw Gruszka <sgruszka@redhat.com>.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Cc: stable@kernel.org [2.6.38+]
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c index 018874964602..09f679d6046f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c @@ -370,6 +370,11 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) } memcpy(active, &ctx->staging, sizeof(*active)); + /* + * We do not commit tx power settings while channel changing, + * do it now if after settings changed. + */ + iwl_set_tx_power(priv, priv->tx_power_next, false); return 0; } |