diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 9c986f272c2d..2945acd955f0 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -2517,7 +2517,7 @@ static void iwl3945_alive_start(struct iwl_priv *priv) | |||
2517 | 2517 | ||
2518 | ieee80211_wake_queues(priv->hw); | 2518 | ieee80211_wake_queues(priv->hw); |
2519 | 2519 | ||
2520 | priv->active_rate = IWL_RATES_MASK; | 2520 | priv->active_rate = IWL_RATES_MASK_3945; |
2521 | 2521 | ||
2522 | iwl_power_update_mode(priv, true); | 2522 | iwl_power_update_mode(priv, true); |
2523 | 2523 | ||
@@ -2535,13 +2535,14 @@ static void iwl3945_alive_start(struct iwl_priv *priv) | |||
2535 | /* Configure Bluetooth device coexistence support */ | 2535 | /* Configure Bluetooth device coexistence support */ |
2536 | priv->cfg->ops->hcmd->send_bt_config(priv); | 2536 | priv->cfg->ops->hcmd->send_bt_config(priv); |
2537 | 2537 | ||
2538 | set_bit(STATUS_READY, &priv->status); | ||
2539 | |||
2538 | /* Configure the adapter for unassociated operation */ | 2540 | /* Configure the adapter for unassociated operation */ |
2539 | iwl3945_commit_rxon(priv, ctx); | 2541 | iwl3945_commit_rxon(priv, ctx); |
2540 | 2542 | ||
2541 | iwl3945_reg_txpower_periodic(priv); | 2543 | iwl3945_reg_txpower_periodic(priv); |
2542 | 2544 | ||
2543 | IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n"); | 2545 | IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n"); |
2544 | set_bit(STATUS_READY, &priv->status); | ||
2545 | wake_up_interruptible(&priv->wait_command_queue); | 2546 | wake_up_interruptible(&priv->wait_command_queue); |
2546 | 2547 | ||
2547 | return; | 2548 | return; |