From 087c298528e8fb2539b5c3a4704fa35d737ad77f Mon Sep 17 00:00:00 2001 From: Wey-Yi Guy Date: Fri, 17 Jul 2009 09:30:20 -0700 Subject: [PATCH] --- yaml --- r: 159159 b: refs/heads/master c: e5108d075c705ed3336163d9ead2b8fe629f680d h: refs/heads/master i: 159157: 5dd04480dee7354b95a30ce2c2e6fd6ff63c763c 159155: 4f1bb38b2f21bf28f342805be983021e7399589b 159151: b410001b99ddaaf0485595efd3a1a66d8bfd4f0e v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-led.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 772a83b243b6..d16196d8b8d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a283c0116b0cc5e82327e50ad4d05f6d4d42c603 +refs/heads/master: e5108d075c705ed3336163d9ead2b8fe629f680d diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-led.c b/trunk/drivers/net/wireless/iwlwifi/iwl-led.c index 36d88a045043..8c8115293b3c 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-led.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-led.c @@ -54,7 +54,7 @@ static const char *led_type_str[] = { static const struct { - u16 tpt; + u16 tpt; /* Mb/s */ u8 on_time; u8 off_time; } blink_tbl[] = @@ -264,13 +264,15 @@ static int iwl_leds_register_led(struct iwl_priv *priv, struct iwl_led *led, /* - * calculate blink rate according to last 2 sec Tx/Rx activities + * calculate blink rate according to last second Tx/Rx activities */ static int iwl_get_blink_rate(struct iwl_priv *priv) { int i; - u64 current_tpt = priv->tx_stats[2].bytes; - /* FIXME: + priv->rx_stats[2].bytes; */ + /* count both tx and rx traffic to be able to + * handle traffic in either direction + */ + u64 current_tpt = priv->tx_stats[2].bytes + priv->rx_stats[2].bytes; s64 tpt = current_tpt - priv->led_tpt; if (tpt < 0) /* wraparound */