iwlegacy: set tx power after rxon_assoc
If settings of tx power was deferred during scan or changing channel we have to setup them during commit rxon. Fix problem on 3945 (4965 already has this fix). Optimize code to apply tx settings only when tx power was actually changed. Cc: stable@kernel.org # 2.6.39+ Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
c1227340ca
commit
17e859a899
|
@ -1746,7 +1746,11 @@ int iwl3945_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(active_rxon, staging_rxon, sizeof(*active_rxon));
|
memcpy(active_rxon, staging_rxon, sizeof(*active_rxon));
|
||||||
|
/*
|
||||||
|
* We do not commit tx power settings while channel changing,
|
||||||
|
* do it now if tx power changed.
|
||||||
|
*/
|
||||||
|
iwl_legacy_set_tx_power(priv, priv->tx_power_next, false);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1235,7 +1235,12 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *c
|
||||||
|
|
||||||
memcpy(active_rxon, &ctx->staging, sizeof(*active_rxon));
|
memcpy(active_rxon, &ctx->staging, sizeof(*active_rxon));
|
||||||
iwl_legacy_print_rx_config_cmd(priv, ctx);
|
iwl_legacy_print_rx_config_cmd(priv, ctx);
|
||||||
goto set_tx_power;
|
/*
|
||||||
|
* We do not commit tx power settings while channel changing,
|
||||||
|
* do it now if tx power changed.
|
||||||
|
*/
|
||||||
|
iwl_legacy_set_tx_power(priv, priv->tx_power_next, false);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If we are currently associated and the new config requires
|
/* If we are currently associated and the new config requires
|
||||||
|
@ -1315,7 +1320,6 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *c
|
||||||
|
|
||||||
iwl4965_init_sensitivity(priv);
|
iwl4965_init_sensitivity(priv);
|
||||||
|
|
||||||
set_tx_power:
|
|
||||||
/* If we issue a new RXON command which required a tune then we must
|
/* 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 */
|
* 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);
|
ret = iwl_legacy_set_tx_power(priv, priv->tx_power_next, true);
|
||||||
|
|
Loading…
Reference in a new issue