Print this page
XXXX introduce drv_sectohz
@@ -4477,11 +4477,11 @@
ctimeout = (vdc_timeout != 0)?
vdc_timeout : vdcp->curr_server->ctimeout;
if (ctimeout != 0 && tmid == 0) {
tmid = timeout(vdc_connection_timeout, vdcp,
- ctimeout * drv_usectohz(MICROSEC));
+ drv_sectohz(ctimeout));
}
/* Switch to STATE_DETACH if drv is detaching */
if (vdcp->lifecycle == VDC_LC_DETACHING) {
vdcp->state = VDC_STATE_DETACH;
@@ -4540,12 +4540,11 @@
/*
* Wait for LDC_UP. If it times out and we have multiple
* servers then we will retry using a different server.
*/
- ldcup_timeout = ddi_get_lbolt() + (vdc_ldcup_timeout *
- drv_usectohz(MICROSEC));
+ ldcup_timeout = ddi_get_lbolt() + drv_sectohz(vdc_ldcup_timeout);
status = cv_timedwait(&vdcp->initwait_cv, &vdcp->lock,
ldcup_timeout);
if (status == -1 &&
vdcp->state == VDC_STATE_INIT_WAITING &&
vdcp->curr_server->ldc_state != LDC_UP) {