diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-12-12 16:04:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:07:03 -0500 |
commit | f3db2bb411512d1ebd6233b3985d98f4fe7ea8a8 (patch) | |
tree | d0f7212810759af300c8fef2ba6009e7c38fc557 | |
parent | 689442dca16eb27fee19074499d42845fe54c12a (diff) |
libertas: make worker thread not freezable
We want it to send the HOST_SLEEP_ACTIVATE command on the way down...
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/libertas/main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index f9bdd123ec45..dd432ea61947 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
@@ -6,7 +6,6 @@ | |||
6 | 6 | ||
7 | #include <linux/moduleparam.h> | 7 | #include <linux/moduleparam.h> |
8 | #include <linux/delay.h> | 8 | #include <linux/delay.h> |
9 | #include <linux/freezer.h> | ||
10 | #include <linux/etherdevice.h> | 9 | #include <linux/etherdevice.h> |
11 | #include <linux/netdevice.h> | 10 | #include <linux/netdevice.h> |
12 | #include <linux/if_arp.h> | 11 | #include <linux/if_arp.h> |
@@ -653,8 +652,6 @@ static int lbs_thread(void *data) | |||
653 | 652 | ||
654 | init_waitqueue_entry(&wait, current); | 653 | init_waitqueue_entry(&wait, current); |
655 | 654 | ||
656 | set_freezable(); | ||
657 | |||
658 | for (;;) { | 655 | for (;;) { |
659 | int shouldsleep; | 656 | int shouldsleep; |
660 | 657 | ||
@@ -698,7 +695,6 @@ static int lbs_thread(void *data) | |||
698 | 695 | ||
699 | set_current_state(TASK_RUNNING); | 696 | set_current_state(TASK_RUNNING); |
700 | remove_wait_queue(&priv->waitq, &wait); | 697 | remove_wait_queue(&priv->waitq, &wait); |
701 | try_to_freeze(); | ||
702 | 698 | ||
703 | lbs_deb_thread("main-thread 333: intcounter=%d currenttxskb=%p dnld_sent=%d\n", | 699 | lbs_deb_thread("main-thread 333: intcounter=%d currenttxskb=%p dnld_sent=%d\n", |
704 | priv->intcounter, priv->currenttxskb, priv->dnld_sent); | 700 | priv->intcounter, priv->currenttxskb, priv->dnld_sent); |