summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDave Kleikamp2006-10-10 23:45:46 +0200
committerJohn W. Linville2006-10-17 02:09:49 +0200
commit5bb85f18087b10a908bd793e9fd3ccd63aebb724 (patch)
treedf42475293ddb5f4a6df3ee6da3999d7df55c66c /drivers/net
parent[PATCH] wireless: More WE-21 potential overflows... (diff)
downloadkernel-qcow2-linux-5bb85f18087b10a908bd793e9fd3ccd63aebb724.tar.gz
kernel-qcow2-linux-5bb85f18087b10a908bd793e9fd3ccd63aebb724.tar.xz
kernel-qcow2-linux-5bb85f18087b10a908bd793e9fd3ccd63aebb724.zip
[PATCH] airo: check if need to freeze
The airo driver used to break out of while loop if there were any signals pending. Since it no longer checks for signals, it at least needs to check if it needs to be frozen. Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com> Cc: Jean Tourrilhes <jt@hpl.hp.com> Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/airo.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index e0710fa9702e..efcdaf1c5f73 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -3098,7 +3098,8 @@ static int airo_thread(void *data) {
set_bit(JOB_AUTOWEP, &ai->jobs);
break;
}
- if (!kthread_should_stop()) {
+ if (!kthread_should_stop() &&
+ !freezing(current)) {
unsigned long wake_at;
if (!ai->expires || !ai->scan_timeout) {
wake_at = max(ai->expires,
@@ -3110,7 +3111,8 @@ static int airo_thread(void *data) {
schedule_timeout(wake_at - jiffies);
continue;
}
- } else if (!kthread_should_stop()) {
+ } else if (!kthread_should_stop() &&
+ !freezing(current)) {
schedule();
continue;
}