---

yaml --- r: 253419 b: refs/heads/master c: 43e4e0b h: refs/heads/master i: 253417: e122dd5 253415: 146de8b v: v3
git-mirror · Jun 8, 2011 · a3921db · a3921db
1 parent 66ae28c
commit a3921db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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;
 	}