[PATCH] Libertas: Fix issues while configuring host sleep

[Bing Zhao]

Hi John,

> -----Original Message-----
> From: libertas-dev-bounces at lists.infradead.org [mailto:libertas-dev-bounces at lists.infradead.org] On
> Behalf Of Bing Zhao
> Sent: Friday, November 06, 2009 1:28 PM
> To: John W. Linville
> Cc: Amitkumar Karwar; linux-wireless at vger.kernel.org; libertas-dev at lists.infradead.org
> Subject: RE: [PATCH] Libertas: Fix issues while configuring host sleep
> 
> Hi John,
> 
> > -----Original Message-----
> > From: John W. Linville [mailto:linville at tuxdriver.com]
> > Sent: Friday, November 06, 2009 12:19 PM
> > To: Bing Zhao
> > Cc: libertas-dev at lists.infradead.org; linux-wireless at vger.kernel.org; Amitkumar Karwar
> > Subject: Re: [PATCH] Libertas: Fix issues while configuring host sleep
> >
> > On Wed, Nov 04, 2009 at 05:06:35PM -0800, Bing Zhao wrote:
> > > From: Amitkumar Karwar <akarwar at marvell.com>
> > >
> > > Configuration of wake-on-lan for unicast, multicast, broadcast, physical
> > > activity was not working. Kernel panic issue was there when user tries to
> > > disable WOL. Fixed them.
> > >
> > > Signed-off-by: Amitkumar Karwar <akarwar at marvell.com>
> > > Signed-off-by: Bing Zhao <bzhao at marvell.com>
> > > ---
> > >  drivers/net/wireless/libertas/ethtool.c |   16 +++++++++++-----
> > >  1 files changed, 11 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/libertas/ethtool.c
> > > index 039b555..eeda6d7 100644
> > > --- a/drivers/net/wireless/libertas/ethtool.c
> > > +++ b/drivers/net/wireless/libertas/ethtool.c
> > > @@ -169,16 +169,22 @@ static int lbs_ethtool_set_wol(struct net_device *dev,
> > >  	struct lbs_private *priv = dev->ml_priv;
> > >  	uint32_t criteria = 0;
> > >
> > > -	if (priv->wol_criteria == 0xffffffff && wol->wolopts)
> > > +	if (priv->wol_criteria != 0xffffffff && wol->wolopts)
> > >  		return -EOPNOTSUPP;
> >
> > Are you sure about this?  This makes me think that you won't be able
> > to change WoL parameters without going through a disable step first.
> > Am I misreading?
> 
> I'm not sure if this is the best fix or not. But without this change, "ethtool -s wlan0 wol u" would
> return "Cannot set new wake-on-lan settings: Operation not supported". Yes, you have to disable it
> first in order to change the WoL parameters.
> 

We can probably just remove the check so that we can change the WoL settings without disabling first.

-	if (priv->wol_criteria == 0xffffffff && wol->wolopts)
-  		return -EOPNOTSUPP;

I will re-send the patch.

Thanks,

Bing