summaryrefslogtreecommitdiffstats
path: root/drivers/connector/cn_queue.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-03-24 06:54:03 +0100
committerDavid S. Miller <davem@davemloft.net>2008-03-24 06:54:03 +0100
commit06802a819a0a2d31c952c0624cea6cd00e4e50da (patch)
tree8ccd7c668c7fbd8f08cb89426006040217caf3f1 /drivers/connector/cn_queue.c
parent[CASSINI]: Use shorter list_splice_init() macro for brevity. (diff)
parentsch_htb: fix "too many events" situation (diff)
downloadlinux-06802a819a0a2d31c952c0624cea6cd00e4e50da.tar.xz
linux-06802a819a0a2d31c952c0624cea6cd00e4e50da.zip
Merge branch 'master' of ../net-2.6/
Conflicts: net/ipv6/ndisc.c
Diffstat (limited to 'drivers/connector/cn_queue.c')
-rw-r--r--drivers/connector/cn_queue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index 5732ca3259f9..b6fe7e7a2c2f 100644
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
@@ -146,7 +146,7 @@ struct cn_queue_dev *cn_queue_alloc_dev(char *name, struct sock *nls)
dev->nls = nls;
- dev->cn_queue = create_workqueue(dev->name);
+ dev->cn_queue = create_singlethread_workqueue(dev->name);
if (!dev->cn_queue) {
kfree(dev);
return NULL;