libertas: fix command timeout after firmware failure

[David Woodhouse]

On Tue, 2008-05-13 at 12:19 -0400, Dan Williams wrote:
> On Tue, 2008-05-13 at 13:54 +0100, David Woodhouse wrote:
> > From: Brian Cavagnolo <brian at cozybit.com>
> > 
> > This is a fix for OLPC ticket #6586: "SCAN command fails, timer doesn't
> > fire". In fact, the timer was firing; the problem was that the dnld_sent
> > state variable was not being updated after the timer expired, so
> > lbs_execute_next_command was not being called.
> > 
> > Signed-off-by: Brian Cavagnolo <brian at cozybit.com>
> > Signed-off-by: Javier Cardona <javier at cozybit.com>
> > Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
> > 
> > ---
> > Bug fix, for 2.6.26 please.
> > 
> > --- a/drivers/net/wireless/libertas/main.c
> > +++ b/drivers/net/wireless/libertas/main.c
> > @@ -756,6 +756,7 @@ static int lbs_thread(void *data)
> >  				priv->nr_retries = 0;
> >  			} else {
> >  				priv->cur_cmd = NULL;
> > +				priv->dnld_sent = DNLD_RES_RECEIVED;
> >  				lbs_pr_info("requeueing command %x due to timeout (#%d)\n",
> >  					    le16_to_cpu(cmdnode->cmdbuf->command), priv->nr_retries);
> 
> We really need to kill dnld_sent.

Yes. I almost managed it at one point but I think I wanted to get set up
to set on CF and SD hardware before I really did it.

-- 
dwmw2