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, 1 Jun 2011 19:36:31 +0000 (15:36 -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.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c

index a95ad84c537752c7c2c9491cc29eb8531c841b38..58c095c00c0cceb227f616296bac690204df19bd 100644 (file)
@@ -362,6 +362,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;
        }