summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-02-04 14:00:41 -0800
committerDavid S. Miller <davem@davemloft.net>2010-02-04 14:00:41 -0800
commit1b3f720bf033fde1fbb6231f9b156b918c5f68d8 (patch)
tree509709296d8e2adc882d4302159b2653b421b55e
parentfeeb2721a7a0bd0cfa5b8847f80aec93aa2cc00d (diff)
downloadop-kernel-dev-1b3f720bf033fde1fbb6231f9b156b918c5f68d8.zip
op-kernel-dev-1b3f720bf033fde1fbb6231f9b156b918c5f68d8.tar.gz
pktgen: Fix freezing problem
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>
-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 de0c2c7..2e692af 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3524,6 +3524,7 @@ static int pktgen_thread_worker(void *arg)
wait_event_interruptible_timeout(t->queue,
t->control != 0,
HZ/10);
+ try_to_freeze();
continue;
}
OpenPOWER on IntegriCloud