Thread (8 messages) 8 messages, 3 authors, 2012-12-02

Re: Wireless regression in workqueue: use mod_delayed_work() instead of __cancel + queue

From: Tejun Heo <tj@kernel.org>
Date: 2012-11-30 22:56:26
Also in: lkml, netdev
Subsystem: the rest, workqueue · Maintainers: Linus Torvalds, Tejun Heo

Hey, again.

Can you please test whether the following patch makes any difference?

Thanks!
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 042d221..26368ef 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1477,7 +1477,10 @@ bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq,
 	} while (unlikely(ret == -EAGAIN));
 
 	if (likely(ret >= 0)) {
-		__queue_delayed_work(cpu, wq, dwork, delay);
+		if (!delay)
+			__queue_work(cpu, wq, &dwork->work);
+		else
+			__queue_delayed_work(cpu, wq, dwork, delay);
 		local_irq_restore(flags);
 	}
 
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help