From f1956ffef55a0f859d3974677c90c728e3fc32f5 Mon Sep 17 00:00:00 2001 From: Cathy Zhou Date: Wed, 20 May 2009 21:09:54 -0700 Subject: 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 --- usr/src/uts/common/io/softmac/softmac_dev.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'usr/src/uts/common/io/softmac/softmac_dev.c') 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); -- cgit v1.2.3