diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index d0d1b7f4c396..ecbe036ecb63 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -455,9 +455,6 @@ static void iwl3945_build_tx_cmd_basic(struct iwl_priv *priv, | |||
455 | tx->timeout.pm_frame_timeout = cpu_to_le16(2); | 455 | tx->timeout.pm_frame_timeout = cpu_to_le16(2); |
456 | } else { | 456 | } else { |
457 | tx->timeout.pm_frame_timeout = 0; | 457 | tx->timeout.pm_frame_timeout = 0; |
458 | #ifdef CONFIG_IWLWIFI_LEDS | ||
459 | priv->rxtxpackets += le16_to_cpu(cmd->cmd.tx.len); | ||
460 | #endif | ||
461 | } | 458 | } |
462 | 459 | ||
463 | tx->driver_txop = 0; | 460 | tx->driver_txop = 0; |
@@ -2483,7 +2480,7 @@ static void iwl3945_alive_start(struct iwl_priv *priv) | |||
2483 | 2480 | ||
2484 | iwl3945_reg_txpower_periodic(priv); | 2481 | iwl3945_reg_txpower_periodic(priv); |
2485 | 2482 | ||
2486 | iwl3945_led_register(priv); | 2483 | iwl_leds_init(priv); |
2487 | 2484 | ||
2488 | IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n"); | 2485 | IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n"); |
2489 | set_bit(STATUS_READY, &priv->status); | 2486 | set_bit(STATUS_READY, &priv->status); |
@@ -2521,7 +2518,6 @@ static void __iwl3945_down(struct iwl_priv *priv) | |||
2521 | if (!exit_pending) | 2518 | if (!exit_pending) |
2522 | set_bit(STATUS_EXIT_PENDING, &priv->status); | 2519 | set_bit(STATUS_EXIT_PENDING, &priv->status); |
2523 | 2520 | ||
2524 | iwl3945_led_unregister(priv); | ||
2525 | iwl_clear_stations_table(priv); | 2521 | iwl_clear_stations_table(priv); |
2526 | 2522 | ||
2527 | /* Unblock any waiting calls */ | 2523 | /* Unblock any waiting calls */ |
@@ -3156,6 +3152,8 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw) | |||
3156 | * no need to poll the killswitch state anymore */ | 3152 | * no need to poll the killswitch state anymore */ |
3157 | cancel_delayed_work(&priv->rfkill_poll); | 3153 | cancel_delayed_work(&priv->rfkill_poll); |
3158 | 3154 | ||
3155 | iwl_led_start(priv); | ||
3156 | |||
3159 | priv->is_open = 1; | 3157 | priv->is_open = 1; |
3160 | IWL_DEBUG_MAC80211(priv, "leave\n"); | 3158 | IWL_DEBUG_MAC80211(priv, "leave\n"); |
3161 | return 0; | 3159 | return 0; |