[PATCH] libertas: don't block usb8388 suspend if no wakeup conditions are set

[PATCH] libertas: don't block usb8388 suspend if no wakeup conditions are set

[Daniel Drake]

This hunk added by commit 66fceb69b72f seems erroneous. We don't want to
prevent suspend of the whole system if no wakeup params are set.

In the case of the usb8388 we do want to keep the card powered up even
if there are no wakeup params. This is because it will continue acting
as a mesh node.

If the mesh is disabled, it would indeed make more sense to power down
the card during suspend, as the equivalent hunk does for the SD interface.
But that's a separate task; for now just restore the previous behaviour.

Signed-off-by: Daniel Drake <dsd@laptop.org>
---
 drivers/net/wireless/libertas/if_usb.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index efaf850..35931cf 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -1090,12 +1090,6 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
 	if (priv->psstate != PS_STATE_FULL_POWER)
 		return -1;
 
-	if (priv->wol_criteria == EHS_REMOVE_WAKEUP) {
-		lbs_pr_info("Suspend attempt without "
-						"configuring wake params!\n");
-		return -ENOSYS;
-	}
-
 	ret = lbs_suspend(priv);
 	if (ret)
 		goto out;
-- 
1.7.2.3

Re: [PATCH] libertas: don't block usb8388 suspend if no wakeup conditions are set

[Dan Williams]

On Sun, 2010-10-31 at 13:40 +0000, Daniel Drake wrote:
> This hunk added by commit 66fceb69b72f seems erroneous. We don't want to
> prevent suspend of the whole system if no wakeup params are set.
> 
> In the case of the usb8388 we do want to keep the card powered up even
> if there are no wakeup params. This is because it will continue acting
> as a mesh node.
> 
> If the mesh is disabled, it would indeed make more sense to power down
> the card during suspend, as the equivalent hunk does for the SD interface.
> But that's a separate task; for now just restore the previous behaviour.
> 
> Signed-off-by: Daniel Drake <dsd@laptop.org>

Acked-by: Dan Williams <dcbw@redhat.com>

> ---
>  drivers/net/wireless/libertas/if_usb.c |    6 ------
>  1 files changed, 0 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
> index efaf850..35931cf 100644
> --- a/drivers/net/wireless/libertas/if_usb.c
> +++ b/drivers/net/wireless/libertas/if_usb.c
> @@ -1090,12 +1090,6 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
>  	if (priv->psstate != PS_STATE_FULL_POWER)
>  		return -1;
>  
> -	if (priv->wol_criteria == EHS_REMOVE_WAKEUP) {
> -		lbs_pr_info("Suspend attempt without "
> -						"configuring wake params!\n");
> -		return -ENOSYS;
> -	}
> -
>  	ret = lbs_suspend(priv);
>  	if (ret)
>  		goto out;

Re: [PATCH] libertas: don't block usb8388 suspend if no wakeup conditions are set

[Daniel Drake]

John, just a quick ping on this maintainer-acked patch
Thanks :)

On 12 November 2010 23:29, Dan Williams <dcbw@redhat.com> wrote:
> On Sun, 2010-10-31 at 13:40 +0000, Daniel Drake wrote:
>> This hunk added by commit 66fceb69b72f seems erroneous. We don't want to
>> prevent suspend of the whole system if no wakeup params are set.
>>
>> In the case of the usb8388 we do want to keep the card powered up even
>> if there are no wakeup params. This is because it will continue acting
>> as a mesh node.
>>
>> If the mesh is disabled, it would indeed make more sense to power down
>> the card during suspend, as the equivalent hunk does for the SD interface.
>> But that's a separate task; for now just restore the previous behaviour.
>>
>> Signed-off-by: Daniel Drake <dsd@laptop.org>
>
> Acked-by: Dan Williams <dcbw@redhat.com>
>
>> ---
>>  drivers/net/wireless/libertas/if_usb.c |    6 ------
>>  1 files changed, 0 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
>> index efaf850..35931cf 100644
>> --- a/drivers/net/wireless/libertas/if_usb.c
>> +++ b/drivers/net/wireless/libertas/if_usb.c
>> @@ -1090,12 +1090,6 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
>>       if (priv->psstate != PS_STATE_FULL_POWER)
>>               return -1;
>>
>> -     if (priv->wol_criteria == EHS_REMOVE_WAKEUP) {
>> -             lbs_pr_info("Suspend attempt without "
>> -                                             "configuring wake params!\n");
>> -             return -ENOSYS;
>> -     }
>> -
>>       ret = lbs_suspend(priv);
>>       if (ret)
>>               goto out;
>
>
>

Re: [PATCH] libertas: don't block usb8388 suspend if no wakeup conditions are set

[John W. Linville]

On Thu, Nov 18, 2010 at 08:15:55PM +0000, Daniel Drake wrote:
> John, just a quick ping on this maintainer-acked patch
> Thanks :)

I have it in wireless-next-2.6.  Do you think it needs to be in 2.6.37?

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] libertas: don't block usb8388 suspend if no wakeup conditions are set

[Daniel Drake]

On 18 November 2010 20:40, John W. Linville <linville@tuxdriver.com> wrote:
> On Thu, Nov 18, 2010 at 08:15:55PM +0000, Daniel Drake wrote:
>> John, just a quick ping on this maintainer-acked patch
>> Thanks :)
>
> I have it in wireless-next-2.6.  Do you think it needs to be in 2.6.37?

Sorry about that. Must have missed it!
linux-next is good enough.

Thanks
Daniel