Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b8d40bc9c9099943cbcf18d285bf241f1f080a44
Commit:     b8d40bc9c9099943cbcf18d285bf241f1f080a44
Parent:     45c24903b7026ec99c059d690f3618e3f95f2790
Author:     David Woodhouse <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 9 23:44:43 2007 -0500
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:06:30 2008 -0800

    libertas: refactor the 'should I sleep?' decision in lbs_thread()
    
    This was making my brain hurt.
    
    Signed-off-by: David Woodhouse <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 drivers/net/wireless/libertas/main.c |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/libertas/main.c 
b/drivers/net/wireless/libertas/main.c
index e9c6b4f..42b64b5 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to