summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/io/softmac/softmac_dev.c
diff options
context:
space:
mode:
authorCathy Zhou <Cathy.Zhou@Sun.COM>2009-05-20 21:09:54 -0700
committerCathy Zhou <Cathy.Zhou@Sun.COM>2009-05-20 21:09:54 -0700
commitf1956ffef55a0f859d3974677c90c728e3fc32f5 (patch)
tree3d1e78d2343cb8ea71be6f31011fd3e1f236f13a /usr/src/uts/common/io/softmac/softmac_dev.c
parentedf70dc9b8e373c558a49c15c2d86be817d497fe (diff)
downloadillumos-gate-f1956ffef55a0f859d3974677c90c728e3fc32f5.tar.gz
6803804 softmac_serialize_enter()/exit() can be replaced using the mac perimeter
6803642 dls_devnet_t reference leak in dls_devnet_setzid() 6807924 net-physical`net_reconfigure() emits errors on non-reconfig boots. 6822408 old-style autopush above network devices no longer works 6832151 memory leak for M_CTL messages sent down to the softmac
Diffstat (limited to 'usr/src/uts/common/io/softmac/softmac_dev.c')
-rw-r--r--usr/src/uts/common/io/softmac/softmac_dev.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/usr/src/uts/common/io/softmac/softmac_dev.c b/usr/src/uts/common/io/softmac/softmac_dev.c
index 37c5740846..0a64e11a8a 100644
--- a/usr/src/uts/common/io/softmac/softmac_dev.c
+++ b/usr/src/uts/common/io/softmac/softmac_dev.c
@@ -254,8 +254,6 @@ softmac_cmn_open(queue_t *rq, dev_t *devp, int flag, int sflag, cred_t *credp)
slp->sl_wq = WR(rq);
cv_init(&slp->sl_cv, NULL, CV_DRIVER, NULL);
mutex_init(&slp->sl_mutex, NULL, MUTEX_DRIVER, NULL);
- cv_init(&slp->sl_ctl_cv, NULL, CV_DRIVER, NULL);
- mutex_init(&slp->sl_ctl_mutex, NULL, MUTEX_DRIVER, NULL);
slp->sl_pending_prim = DL_PRIM_INVAL;
rq->q_ptr = WR(rq)->q_ptr = slp;
qprocson(rq);
@@ -289,14 +287,11 @@ softmac_mod_close(queue_t *rq)
slp->sl_lh = NULL;
ASSERT(slp->sl_ack_mp == NULL);
- ASSERT(slp->sl_ctl_inprogress == B_FALSE);
ASSERT(slp->sl_pending_prim == DL_PRIM_INVAL);
ASSERT(slp->sl_pending_ioctl == B_FALSE);
cv_destroy(&slp->sl_cv);
mutex_destroy(&slp->sl_mutex);
- cv_destroy(&slp->sl_ctl_cv);
- mutex_destroy(&slp->sl_ctl_mutex);
kmem_free(slp, sizeof (*slp));
return (0);