From e64754332783c35ba007999df49ddb19bb1fcdcc Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 9 Dec 2007 23:44:43 -0500 Subject: [PATCH] --- yaml --- r: 79144 b: refs/heads/master c: b8d40bc9c9099943cbcf18d285bf241f1f080a44 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/main.c | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 07d962738e17..dbd550ff13a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45c24903b7026ec99c059d690f3618e3f95f2790 +refs/heads/master: b8d40bc9c9099943cbcf18d285bf241f1f080a44 diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c index e9c6b4ffd8e1..42b64b5ad083 100644 --- a/trunk/drivers/net/wireless/libertas/main.c +++ b/trunk/drivers/net/wireless/libertas/main.c @@ -722,6 +722,8 @@ static int lbs_thread(void *data) set_freezable(); for (;;) { + int shouldsleep; + lbs_deb_thread( "main-thread 111: intcounter=%d currenttxskb=%p dnld_sent=%d\n", priv->intcounter, priv->currenttxskb, priv->dnld_sent); @@ -729,8 +731,22 @@ static int lbs_thread(void *data) set_current_state(TASK_INTERRUPTIBLE); spin_lock_irq(&priv->driver_lock); - if ((priv->psstate == PS_STATE_SLEEP) || - (!priv->intcounter && (priv->dnld_sent || priv->cur_cmd || list_empty(&priv->cmdpendingq)))) { + if (priv->surpriseremoved) + shouldsleep = 0; /* Bye */ + else if (priv->psstate == PS_STATE_SLEEP) + shouldsleep = 1; /* Sleep mode. Nothing we can do till it wakes */ + else if (priv->intcounter) + shouldsleep = 0; /* Interrupt pending. Deal with it now */ + else if (priv->dnld_sent) + shouldsleep = 1; /* Something is en route to the device already */ + else if (priv->cur_cmd) + shouldsleep = 1; /* Can't send a command; one already running */ + else if (!list_empty(&priv->cmdpendingq)) + shouldsleep = 0; /* We have a command to send */ + else + shouldsleep = 1; /* No command */ + + if (shouldsleep) { lbs_deb_thread("main-thread sleeping... Conn=%d IntC=%d PS_mode=%d PS_State=%d\n", priv->connect_status, priv->intcounter, priv->psmode, priv->psstate);