diff options
| author |   Zhu Yi <yi.zhu@intel.com> | 2008-07-11 11:53:40 +0800 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2008-07-14 14:53:00 -0400 |
| commit | 36da7d70e307f8650db1b1c7350d2161ca3829ef (patch) | |
| tree | 3f199151754efae25c2bca4594346f289e61ff35 /drivers | |
| parent | iwlwifi: enable active scanning (diff) | |
| download | linux-dev-36da7d70e307f8650db1b1c7350d2161ca3829ef.tar.xz linux-dev-36da7d70e307f8650db1b1c7350d2161ca3829ef.zip | |
iwlwifi: send TXPOWER command after a new RXON command
The patch fixes the problem that TXPOWER command is not sent
after we issue a new RXON command which requires a tune. Otherwise
we won't be able to Tx any frames.
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 55648a8c88a2..71f5da3fe5c4 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -328,16 +328,6 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv) if (!priv->error_recovering) priv->start_calib = 0; - iwl_init_sensitivity(priv); - - /* 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_set_tx_power(priv, priv->tx_power_user_lmt, true); - if (ret) { - IWL_ERROR("Error sending TX power (%d)\n", ret); - return ret; - } - /* Add the broadcast address so we can send broadcast frames */ if (iwl_rxon_add_station(priv, iwl_bcast_addr, 0) == IWL_INVALID_STATION) { @@ -373,6 +363,16 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv) memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon)); } + iwl_init_sensitivity(priv); + + /* 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_set_tx_power(priv, priv->tx_power_user_lmt, true); + if (ret) { + IWL_ERROR("Error sending TX power (%d)\n", ret); + return ret; + } + return 0; } |