[PATCH 2.6.39 v2] iwlegacy: led stay solid on when no traffic

[PATCH 2.6.39 v2] iwlegacy: led stay solid on when no traffic

[Wey-Yi Guy]

commit 843f26f06a41c5797f19e843c23ca4ed2a71a0bc change the led behavior
for iwlwifi driver; the side effect cause led blink all the time.

Modify the led blink table to fix this problem

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---
v2: remove "-1" entry from table
---
 drivers/net/wireless/iwlegacy/iwl-led.c |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/iwlegacy/iwl-led.c b/drivers/net/wireless/iwlegacy/iwl-led.c
index 15eb8b7..bda0d61 100644
--- a/drivers/net/wireless/iwlegacy/iwl-led.c
+++ b/drivers/net/wireless/iwlegacy/iwl-led.c
@@ -48,8 +48,21 @@ module_param(led_mode, int, S_IRUGO);
 MODULE_PARM_DESC(led_mode, "0=system default, "
 		"1=On(RF On)/Off(RF Off), 2=blinking");
 
+/* Throughput		OFF time(ms)	ON time (ms)
+ *	>300			25		25
+ *	>200 to 300		40		40
+ *	>100 to 200		55		55
+ *	>70 to 100		65		65
+ *	>50 to 70		75		75
+ *	>20 to 50		85		85
+ *	>10 to 20		95		95
+ *	>5 to 10		110		110
+ *	>1 to 5			130		130
+ *	>0 to 1			167		167
+ *	<=0					SOLID ON
+ */
 static const struct ieee80211_tpt_blink iwl_blink[] = {
-	{ .throughput = 0 * 1024 - 1, .blink_time = 334 },
+	{ .throughput = 0, .blink_time = 334 },
 	{ .throughput = 1 * 1024 - 1, .blink_time = 260 },
 	{ .throughput = 5 * 1024 - 1, .blink_time = 220 },
 	{ .throughput = 10 * 1024 - 1, .blink_time = 190 },
@@ -101,6 +114,11 @@ static int iwl_legacy_led_cmd(struct iwl_priv *priv,
 	if (priv->blink_on == on && priv->blink_off == off)
 		return 0;
 
+	if (off == 0) {
+		/* led is SOLID_ON */
+		on = IWL_LED_SOLID;
+	}
+
 	IWL_DEBUG_LED(priv, "Led blink time compensation=%u\n",
 			priv->cfg->base_params->led_compensation);
 	led_cmd.on = iwl_legacy_blink_compensation(priv, on,
-- 
1.7.0.4

Re: [PATCH 2.6.39 v2] iwlegacy: led stay solid on when no traffic

[John W. Linville]

On Mon, Apr 25, 2011 at 11:12:57AM -0700, Wey-Yi Guy wrote:
> commit 843f26f06a41c5797f19e843c23ca4ed2a71a0bc change the led behavior
> for iwlwifi driver; the side effect cause led blink all the time.
> 
> Modify the led blink table to fix this problem
> 
> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

Patch seems fine, but I can't find the listed commit ID that caused this issue?

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH 2.6.39 v2] iwlegacy: led stay solid on when no traffic

[Guy, Wey-Yi]

On Tue, 2011-04-26 at 12:08 -0700, John W. Linville wrote:
> On Mon, Apr 25, 2011 at 11:12:57AM -0700, Wey-Yi Guy wrote:
> > commit 843f26f06a41c5797f19e843c23ca4ed2a71a0bc change the led behavior
> > for iwlwifi driver; the side effect cause led blink all the time.
> > 
> > Modify the led blink table to fix this problem
> > 
> > Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
> 
> Patch seems fine, but I can't find the listed commit ID that caused this issue?
> 
it is in wireless-testing


commit 843f26f06a41c5797f19e843c23ca4ed2a71a0bc
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Wed Dec 15 07:30:01 2010 -0800

    iwlwifi: use mac80211 throughput trigger
    
    Instead of keeping track of LED blink speed
    in the driver, use the new mac80211 trigger
    and link it up with an LED classdev that we
    now register. This also allows users more
    flexibility in how they want to have the LED
    blink or not.
    
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>



for wireless-next-2.6, it is
commit#commit 5ed540aecc2aae92d5c97b9a9306a5bf88ad5574


Thanks
Wey

Re: [PATCH 2.6.39 v2] iwlegacy: led stay solid on when no traffic

[John W. Linville]

On Tue, Apr 26, 2011 at 12:10:11PM -0700, Guy, Wey-Yi wrote:
> On Tue, 2011-04-26 at 12:08 -0700, John W. Linville wrote:
> > On Mon, Apr 25, 2011 at 11:12:57AM -0700, Wey-Yi Guy wrote:
> > > commit 843f26f06a41c5797f19e843c23ca4ed2a71a0bc change the led behavior
> > > for iwlwifi driver; the side effect cause led blink all the time.
> > > 
> > > Modify the led blink table to fix this problem
> > > 
> > > Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
> > 
> > Patch seems fine, but I can't find the listed commit ID that caused this issue?
> > 
> it is in wireless-testing

/home/linville/git/wireless-testing
[linville-8530p.local]:> git show 843f26f06a41c5797f19e843c23ca4ed2a71a0bc
fatal: bad object 843f26f06a41c5797f19e843c23ca4ed2a71a0bc

Must be your local tree?

> commit 843f26f06a41c5797f19e843c23ca4ed2a71a0bc
> Author: Johannes Berg <johannes.berg@intel.com>
> Date:   Wed Dec 15 07:30:01 2010 -0800
> 
>     iwlwifi: use mac80211 throughput trigger
>     
>     Instead of keeping track of LED blink speed
>     in the driver, use the new mac80211 trigger
>     and link it up with an LED classdev that we
>     now register. This also allows users more
>     flexibility in how they want to have the LED
>     blink or not.
>     
>     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>     Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
> 
> 
> 
> for wireless-next-2.6, it is
> commit#commit 5ed540aecc2aae92d5c97b9a9306a5bf88ad5574

Thanks -- please cite the commit IDs from the public trees or just
use the subject.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH 2.6.39 v2] iwlegacy: led stay solid on when no traffic

[Guy, Wey-Yi]

On Tue, 2011-04-26 at 13:27 -0700, John W. Linville wrote:
> On Tue, Apr 26, 2011 at 12:10:11PM -0700, Guy, Wey-Yi wrote:
> > On Tue, 2011-04-26 at 12:08 -0700, John W. Linville wrote:
> > > On Mon, Apr 25, 2011 at 11:12:57AM -0700, Wey-Yi Guy wrote:
> > > > commit 843f26f06a41c5797f19e843c23ca4ed2a71a0bc change the led behavior
> > > > for iwlwifi driver; the side effect cause led blink all the time.
> > > > 
> > > > Modify the led blink table to fix this problem
> > > > 
> > > > Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
> > > 
> > > Patch seems fine, but I can't find the listed commit ID that caused this issue?
> > > 
> > it is in wireless-testing
> 
> /home/linville/git/wireless-testing
> [linville-8530p.local]:> git show 843f26f06a41c5797f19e843c23ca4ed2a71a0bc
> fatal: bad object 843f26f06a41c5797f19e843c23ca4ed2a71a0bc
> 
> Must be your local tree?
> 
> > commit 843f26f06a41c5797f19e843c23ca4ed2a71a0bc
> > Author: Johannes Berg <johannes.berg@intel.com>
> > Date:   Wed Dec 15 07:30:01 2010 -0800
> > 
> >     iwlwifi: use mac80211 throughput trigger
> >     
> >     Instead of keeping track of LED blink speed
> >     in the driver, use the new mac80211 trigger
> >     and link it up with an LED classdev that we
> >     now register. This also allows users more
> >     flexibility in how they want to have the LED
> >     blink or not.
> >     
> >     Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> >     Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
> > 
> > 
> > 
> > for wireless-next-2.6, it is
> > commit#commit 5ed540aecc2aae92d5c97b9a9306a5bf88ad5574
> 
> Thanks -- please cite the commit IDs from the public trees or just
> use the subject.

Sorry, need to make sure have the right commit# next time

Thanks
Wey