summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-02-04 14:00:41 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-02-23 07:37:56 -0800
commit6d14e6b46af551e2551594ab5ab9356fb4cebbe7 (patch)
tree2b672e93910d0c189b172e78e7d41f289b71ddf0
parente045288ec2a2274dc26eaba6b21cf2770b48e0ed (diff)
downloadlwn-6d14e6b46af551e2551594ab5ab9356fb4cebbe7.tar.gz
lwn-6d14e6b46af551e2551594ab5ab9356fb4cebbe7.zip
pktgen: Fix freezing problem
commit 1b3f720bf033fde1fbb6231f9b156b918c5f68d8 upstream. Add missing try_to_freeze() to one of the pktgen_thread_worker() code paths so that it doesn't block suspend/hibernation. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=15006 Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Reported-and-tested-by: Ciprian Dorin Craciun <ciprian.craciun@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--net/core/pktgen.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 6e79e96cb4f2..6a993b17ae3f 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3516,6 +3516,7 @@ static int pktgen_thread_worker(void *arg)
wait_event_interruptible_timeout(t->queue,
t->control != 0,
HZ/10);
+ try_to_freeze();
continue;
}