From a3921dba8183b5cd595d51bf2f6543e3edb87c4f Mon Sep 17 00:00:00 2001 From: Wey-Yi Guy Date: Fri, 27 May 2011 08:40:24 -0700 Subject: [PATCH] --- yaml --- r: 253419 b: refs/heads/master c: 43e4e0b94984b45d52048e3ac027cac15c718b65 h: refs/heads/master i: 253417: e122dd533aec3060bd74b3ef5dc4c76a3e9411ae 253415: 146de8b7b0bed4dcd1cd52fdfe27e73e2299d3b4 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8ced05617612..b470b3bd411b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57a27e1d6a3bb9ad4efeebd3a8c71156d6207536 +refs/heads/master: 43e4e0b94984b45d52048e3ac027cac15c718b65 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c index 018874964602..09f679d6046f 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/trunk/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; }