summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorBryan Cantrill <bryancantrill@gmail.com>2011-04-21 20:06:36 -0400
committerBryan Cantrill <bryancantrill@gmail.com>2011-04-21 20:06:36 -0400
commit5a74db2d25b207135db8a909479fc4fb8a27b15d (patch)
tree898bf552d2f086b389fffe76d874c0ff9e8cfd85 /usr/src
parentee5ddc3052f31890b6e9653ebd5dcf4ec30bcb1b (diff)
downloadillumos-joyent-5a74db2d25b207135db8a909479fc4fb8a27b15d.tar.gz
915 ill_taskq_dispatch() race condition
Reviewed by: Dan McDonald <danmcd@nexenta.com> Reviewed by: Richard Lowe <richlowe@richlowe.net> Reviewed by: Albert Lee <trisk@opensolaris.org> Reviewed by: Gordon Ross <gordon.w.ross@gmail.com> Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/inet/ip/ip.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/uts/common/inet/ip/ip.c b/usr/src/uts/common/inet/ip/ip.c
index f937d4dbea..ea0602a8b2 100644
--- a/usr/src/uts/common/inet/ip/ip.c
+++ b/usr/src/uts/common/inet/ip/ip.c
@@ -22,6 +22,7 @@
/*
* Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1990 Mentat Inc.
+ * Copyright (c) 2011 Joyent, Inc. All rights reserved.
*/
#include <sys/types.h>
@@ -4646,10 +4647,10 @@ ip_stack_init(netstackid_t stackid, netstack_t *ns)
/*
* Create the taskq dispatcher thread and initialize related stuff.
*/
- ipst->ips_capab_taskq_thread = thread_create(NULL, 0,
- ill_taskq_dispatch, ipst, 0, &p0, TS_RUN, minclsyspri);
mutex_init(&ipst->ips_capab_taskq_lock, NULL, MUTEX_DEFAULT, NULL);
cv_init(&ipst->ips_capab_taskq_cv, NULL, CV_DEFAULT, NULL);
+ ipst->ips_capab_taskq_thread = thread_create(NULL, 0,
+ ill_taskq_dispatch, ipst, 0, &p0, TS_RUN, minclsyspri);
major = mod_name_to_major(INET_NAME);
(void) ldi_ident_from_major(major, &ipst->ips_ldi_ident);