diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 9ae3d2981df5..a04127a8acf7 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -2238,8 +2238,9 @@ static void iwl4965_build_tx_cmd_basic(struct iwl_priv *priv, | |||
2238 | cmd->cmd.tx.timeout.pm_frame_timeout = cpu_to_le16(3); | 2238 | cmd->cmd.tx.timeout.pm_frame_timeout = cpu_to_le16(3); |
2239 | else | 2239 | else |
2240 | cmd->cmd.tx.timeout.pm_frame_timeout = cpu_to_le16(2); | 2240 | cmd->cmd.tx.timeout.pm_frame_timeout = cpu_to_le16(2); |
2241 | } else | 2241 | } else { |
2242 | cmd->cmd.tx.timeout.pm_frame_timeout = 0; | 2242 | cmd->cmd.tx.timeout.pm_frame_timeout = 0; |
2243 | } | ||
2243 | 2244 | ||
2244 | cmd->cmd.tx.driver_txop = 0; | 2245 | cmd->cmd.tx.driver_txop = 0; |
2245 | cmd->cmd.tx.tx_flags = tx_flags; | 2246 | cmd->cmd.tx.tx_flags = tx_flags; |
@@ -5712,6 +5713,8 @@ static void iwl4965_alive_start(struct iwl_priv *priv) | |||
5712 | IWL_DEBUG_INFO("ALIVE processing complete.\n"); | 5713 | IWL_DEBUG_INFO("ALIVE processing complete.\n"); |
5713 | wake_up_interruptible(&priv->wait_command_queue); | 5714 | wake_up_interruptible(&priv->wait_command_queue); |
5714 | 5715 | ||
5716 | iwl_leds_register(priv); | ||
5717 | |||
5715 | if (priv->error_recovering) | 5718 | if (priv->error_recovering) |
5716 | iwl4965_error_recovery(priv); | 5719 | iwl4965_error_recovery(priv); |
5717 | 5720 | ||
@@ -5736,6 +5739,8 @@ static void __iwl4965_down(struct iwl_priv *priv) | |||
5736 | if (!exit_pending) | 5739 | if (!exit_pending) |
5737 | set_bit(STATUS_EXIT_PENDING, &priv->status); | 5740 | set_bit(STATUS_EXIT_PENDING, &priv->status); |
5738 | 5741 | ||
5742 | iwl_leds_unregister(priv); | ||
5743 | |||
5739 | iwlcore_clear_stations_table(priv); | 5744 | iwlcore_clear_stations_table(priv); |
5740 | 5745 | ||
5741 | /* Unblock any waiting calls */ | 5746 | /* Unblock any waiting calls */ |