Re: 2.6.19-rc1 regression: airo suspend fails

Dave Kleikamp
2006-10-07T19:52:51Z

On Fri, 2006-10-06 at 20:47 +0200, Adrian Bunk wrote:
> On Thu, Oct 05, 2006 at 09:31:16PM -0700, Alex Romosan wrote:

> > it breaks suspend when the airo module is loaded:
> >
> > kernel: Stopping tasks: =================================================================================
> > kernel: stopping tasks timed out after 20 seconds (1 tasks remaining):
> > kernel: eth1
> > kernel: Restarting tasks...<6> Strange, eth1 not stopped
> >
> > if i remove the airo module suspend works normally (this is on a
> > thinkpad t40).
>
> Thanks for your report.
>
> Let's try to figure out what broke it.

I believe it was broken by:
http://www.kernel.org/git/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3b4c7d640376dbccfe80fc4f7b8772ecc7de28c5

I have seen this in the -mm tree, but didn't follow up at the time. I
was able to fix it with the following patch. I don't know if it's the
best fix, but it seems to follow the same logic as the original code.

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>

diff -Nurp linux-2.6.19-rc1/drivers/net/wireless/airo.c linux/drivers/net/wireless/airo.c
--- linux-2.6.19-rc1/drivers/net/wireless/airo.c 2006-10-05 07:22:39.000000000 -0500
+++ linux/drivers/net/wireless/airo.c 2006-10-07 13:42:13.000000000 -0500
@@ -3090,7 +3090,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,
@@ -3102,7 +3103,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;
}

--
David Kleikamp
IBM Linux Technology Center