iwlagn: send tx power command if defer cause by RXON not match
authorWey-Yi Guy <wey-yi.w.guy@intel.com>
Fri, 27 May 2011 15:40:24 +0000 (08:40 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 8 Jun 2011 18:17:27 +0000 (14:17 -0400)
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>
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c

index 01887496460278dff94e53859ee1b087611196a0..09f679d6046f94ddc4ed8be2ae9b5fd12e1b64a4 100644 (file)
@@ -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;
        }