summaryrefslogtreecommitdiffstats
path: root/sys/pci
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-08-19 06:56:50 +0000
committerphk <phk@FreeBSD.org>2002-08-19 06:56:50 +0000
commitb08a6ac7b9d53d9c8af42dc1cd4b5c364004ef5b (patch)
tree38334154203fd79ed9cfe775fecbd82c6a87c85c /sys/pci
parent8346c2fde3e084def3fc0de74bf98c5b2f0f0198 (diff)
downloadFreeBSD-src-b08a6ac7b9d53d9c8af42dc1cd4b5c364004ef5b.zip
FreeBSD-src-b08a6ac7b9d53d9c8af42dc1cd4b5c364004ef5b.tar.gz
Remove the SIS_LOCK/SIS_UNLOCK from sis_attach(). It makes WITNESS
barf and there seem to be little room for contention during attach.
Diffstat (limited to 'sys/pci')
-rw-r--r--sys/pci/if_sis.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 977e83f..ed48639 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -795,7 +795,6 @@ static int sis_attach(dev)
mtx_init(&sc->sis_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
- SIS_LOCK(sc);
if (pci_get_device(dev) == SIS_DEVICEID_900)
sc->sis_type = SIS_TYPE_900;
@@ -1116,11 +1115,9 @@ static int sis_attach(dev)
ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
callout_handle_init(&sc->sis_stat_ch);
- SIS_UNLOCK(sc);
return(0);
fail:
- SIS_UNLOCK(sc);
mtx_destroy(&sc->sis_mtx);
return(error);
}
OpenPOWER on IntegriCloud