iwl4965: set tx power after rxon_assoc

PATCH New Stanislaw Gruszka 1 participant 1 message Jun 6, 2011 Networking drivers (wireless)

Share & tools

Stanislaw Gruszka

author

2011-06-06 13:11 UTC #0 lore raw

PATCH 1/1 iwl4965: set tx power after rxon_assoc

Setting tx power can be deferred during scan or changing channel. If after that correct tx power settings will not be sent to device, we can observe transmission problems and timeouts. Force to send tx power settings also after partial rxon change, to assure device always be configured with up-to-date settings.

Resolves:
https://bugzilla.kernel.org/show_bug.cgi?id=36492

Cc [email protected] # 2.6.39+

Signed-off-by Stanislaw Gruszka <[email protected]>

---
 drivers/net/wireless/iwlegacy/iwl-4965.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

drivers/net/wireless/iwlegacy/iwl-4965.c +2 -1

index 8f33f63..3a022bc 100644
@@ -1235,7 +1235,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *c
 
 		memcpy(active_rxon, &ctx->staging, sizeof(*active_rxon));
 		iwl_legacy_print_rx_config_cmd(priv, ctx);
-		return 0;
+		goto set_tx_power;
 	}
 
 	/* If we are currently associated and the new config requires

@@ -1315,6 +1315,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *c
 
 	iwl4965_init_sensitivity(priv);
 
+set_tx_power:
 	/* If we issue a new RXON command which required a tune then we must
 	 * send a new TXPOWER command or we won't be able to Tx any frames */
 	ret = iwl_legacy_set_tx_power(priv, priv->tx_power_next, true);

Signature · 1 line

1.7.1