aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorWey-Yi Guy <wey-yi.w.guy@intel.com>2010-11-12 16:52:37 -0500
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2010-11-16 10:47:35 -0500
commit9e2e7422d059f9b98c3a0810df92a1ff660ade2f (patch)
tree6c680a9c312f5d37dbce287c97251e40d80c58f0 /drivers/net/wireless
parent6163a3735aad19bdb8d02b3362d3a2d7d2eb78d5 (diff)
iwlwifi: set STATUS_READY before commit_rxon
Have the STATUS_READY bit set before commit_rxon call to avoid fail to send tx power to uCode. Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index c6e455e8845a..5b96b0d80091 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2717,6 +2717,8 @@ static void iwl_alive_start(struct iwl_priv *priv)
2717 2717
2718 iwl_reset_run_time_calib(priv); 2718 iwl_reset_run_time_calib(priv);
2719 2719
2720 set_bit(STATUS_READY, &priv->status);
2721
2720 /* Configure the adapter for unassociated operation */ 2722 /* Configure the adapter for unassociated operation */
2721 iwlcore_commit_rxon(priv, ctx); 2723 iwlcore_commit_rxon(priv, ctx);
2722 2724
@@ -2726,7 +2728,6 @@ static void iwl_alive_start(struct iwl_priv *priv)
2726 iwl_leds_init(priv); 2728 iwl_leds_init(priv);
2727 2729
2728 IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n"); 2730 IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n");
2729 set_bit(STATUS_READY, &priv->status);
2730 wake_up_interruptible(&priv->wait_command_queue); 2731 wake_up_interruptible(&priv->wait_command_queue);
2731 2732
2732 iwl_power_update_mode(priv, true); 2733 iwl_power_update_mode(priv, true);