aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/iwl-4965.c
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2011-02-24 14:23:55 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-02-25 15:32:33 -0500
commit43f12d47f0580e04e26c14c03cb19cea9687854e (patch)
tree1674d9f8a2a8d692f34e5dd664a45c1941e0720e /drivers/net/wireless/iwlegacy/iwl-4965.c
parent3083e83c86e604ac7005c100b7d7242389407ba5 (diff)
downloadkernel_samsung_smdk4412-43f12d47f0580e04e26c14c03cb19cea9687854e.zip
kernel_samsung_smdk4412-43f12d47f0580e04e26c14c03cb19cea9687854e.tar.gz
kernel_samsung_smdk4412-43f12d47f0580e04e26c14c03cb19cea9687854e.tar.bz2
iwlegacy: do not set tx power when channel is changing
Same fix as f844a709a7d8f8be61a571afc31dfaca9e779621 "iwlwifi: do not set tx power when channel is changing". 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/iwlegacy/iwl-4965.c')
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-4965.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965.c b/drivers/net/wireless/iwlegacy/iwl-4965.c
index 080444c..f5433c7 100644
--- a/drivers/net/wireless/iwlegacy/iwl-4965.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965.c
@@ -1319,7 +1319,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *c
/* If we issue a new RXON command which required a tune then we must
* send a new TXPOWER command or we won't be able to Tx any frames */
- ret = iwl_legacy_set_tx_power(priv, priv->tx_power_user_lmt, true);
+ ret = iwl_legacy_set_tx_power(priv, priv->tx_power_next, true);
if (ret) {
IWL_ERR(priv, "Error sending TX power (%d)\n", ret);
return ret;