diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2009-10-23 16:42:22 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-27 16:49:59 -0400 |
commit | 1ed2a3d29ac304092f588a47a9ed2b83d4d8c835 (patch) | |
tree | 45a2405b6de563229ea0abaca48c7ba835bb6384 /drivers/net/wireless/iwlwifi | |
parent | fadb3582a38c33d0f7c58ab7905d4dbc67f4c4d9 (diff) |
iwlwifi: separate led function from statistic notification
Detach led background task from statistic notification routine. if led
blinking is required; the blink rate is based on the traffic condition.
It do not relate to statistics notification. In addition to that, there is
not a requirement for statistics notification has to occur all the time.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rx.c | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index 7142aa5dbdb5..269b9889e39e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
@@ -359,8 +359,6 @@ void iwl3945_hw_rx_statistics(struct iwl_priv *priv, | |||
359 | le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK); | 359 | le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK); |
360 | 360 | ||
361 | memcpy(&priv->statistics_39, pkt->u.raw, sizeof(priv->statistics_39)); | 361 | memcpy(&priv->statistics_39, pkt->u.raw, sizeof(priv->statistics_39)); |
362 | |||
363 | iwl_leds_background(priv); | ||
364 | } | 362 | } |
365 | 363 | ||
366 | /****************************************************************************** | 364 | /****************************************************************************** |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 64d918787e88..a34acb7e44c3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -1019,6 +1019,7 @@ static void iwl_irq_tasklet_legacy(struct iwl_priv *priv) | |||
1019 | if (inta & (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX)) { | 1019 | if (inta & (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX)) { |
1020 | iwl_rx_handle(priv); | 1020 | iwl_rx_handle(priv); |
1021 | priv->isr_stats.rx++; | 1021 | priv->isr_stats.rx++; |
1022 | iwl_leds_background(priv); | ||
1022 | handled |= (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX); | 1023 | handled |= (CSR_INT_BIT_FH_RX | CSR_INT_BIT_SW_RX); |
1023 | } | 1024 | } |
1024 | 1025 | ||
@@ -1220,6 +1221,7 @@ static void iwl_irq_tasklet(struct iwl_priv *priv) | |||
1220 | CSR_INT_PERIODIC_ENA); | 1221 | CSR_INT_PERIODIC_ENA); |
1221 | 1222 | ||
1222 | priv->isr_stats.rx++; | 1223 | priv->isr_stats.rx++; |
1224 | iwl_leds_background(priv); | ||
1223 | } | 1225 | } |
1224 | 1226 | ||
1225 | if (inta & CSR_INT_BIT_FH_TX) { | 1227 | if (inta & CSR_INT_BIT_FH_TX) { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index 0a407f79de01..cfc31ae4712b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c | |||
@@ -627,9 +627,6 @@ void iwl_rx_statistics(struct iwl_priv *priv, | |||
627 | iwl_rx_calc_noise(priv); | 627 | iwl_rx_calc_noise(priv); |
628 | queue_work(priv->workqueue, &priv->run_time_calib_work); | 628 | queue_work(priv->workqueue, &priv->run_time_calib_work); |
629 | } | 629 | } |
630 | |||
631 | iwl_leds_background(priv); | ||
632 | |||
633 | if (priv->cfg->ops->lib->temp_ops.temperature && change) | 630 | if (priv->cfg->ops->lib->temp_ops.temperature && change) |
634 | priv->cfg->ops->lib->temp_ops.temperature(priv); | 631 | priv->cfg->ops->lib->temp_ops.temperature(priv); |
635 | } | 632 | } |