diff options
| author | Brian Cavagnolo <brian@cozybit.com> | 2008-05-13 13:54:59 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-05-16 17:15:09 -0400 |
| commit | 02969d296e91626d9942ea15f8a95fe056025ef1 (patch) | |
| tree | c05cc2b9fc7ff8f07a43e126847c354de3f34b0d /drivers/net/wireless | |
| parent | 2f561feb386d6adefbad63c59a1fcd298ac6a79c (diff) | |
| download | linux-02969d296e91626d9942ea15f8a95fe056025ef1.tar.bz2 | |
libertas: fix command timeout after firmware failure
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@cozybit.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/libertas/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 406f54d40956..bb08f0b86c6b 100644 --- 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); |