commit: 43e4e0b94984b45d52048e3ac027cac15c718b65
From: Wey-Yi Guy <[email protected]>
Date: Fri, 27 May 2011 08:40:24 -0700
Subject: [PATCH] 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 <[email protected]>.

Signed-off-by: Wey-Yi Guy <[email protected]>
Cc: [email protected] [2.6.38+]
Signed-off-by: John W. Linville <[email protected]>
---
 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 0188749..09f679d 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;
        }
 

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to