Re: 2.6.19-rc1 regression: airo suspend fails

Alex Romosan
2006-10-07T20:17:13Z

Dave Kleikamp <shaggy@austin.ibm.com> writes:

> 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;
> }
>

thanks. with this patch applied i can suspend to ram with the airo
module loaded.

--alex--

--
| I believe the moment is at hand when, by a paranoiac and active |
| advance of the mind, it will be possible (simultaneously with |
| automatism and other passive states) to systematize confusion |
| and thus to help to discredit completely the world of reality. |