From f17f27698a8a1afaf9efa45414bce214ae138f53 Mon Sep 17 00:00:00 2001 From: Andrew Vasquez Date: Thu, 9 Feb 2012 11:15:45 -0800 Subject: [PATCH] --- yaml --- r: 292935 b: refs/heads/master c: 7f45dd0b3d39aee114b969a2bf84ac883b2cd196 h: refs/heads/master i: 292933: ebd2f5c1460f00bf541df2ccb4378e0967ed8352 292931: 7caa0d848cad0d6f04ecd0b68674f97ff2622097 292927: 5c2b26f5a80b3d99425ab04457ec16dc6d05fcb7 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_mbx.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index df8369a5b6c3..326c423f6610 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7bfbe12dc7223096005338a3099b2eec685bc30 +refs/heads/master: 7f45dd0b3d39aee114b969a2bf84ac883b2cd196 diff --git a/trunk/drivers/scsi/qla2xxx/qla_mbx.c b/trunk/drivers/scsi/qla2xxx/qla_mbx.c index 61e2fb75fbf0..5470177a1ee1 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_mbx.c +++ b/trunk/drivers/scsi/qla2xxx/qla_mbx.c @@ -1643,7 +1643,8 @@ qla24xx_login_fabric(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain, lg->port_id[1] = area; lg->port_id[2] = domain; lg->vp_index = vha->vp_idx; - rval = qla2x00_issue_iocb(vha, lg, lg_dma, 0); + rval = qla2x00_issue_iocb_timeout(vha, lg, lg_dma, 0, + (ha->r_a_tov / 10 * 2) + 2); if (rval != QLA_SUCCESS) { ql_dbg(ql_dbg_mbx, vha, 0x1063, "Failed to issue login IOCB (%x).\n", rval); @@ -1906,8 +1907,8 @@ qla24xx_fabric_logout(scsi_qla_host_t *vha, uint16_t loop_id, uint8_t domain, lg->port_id[1] = area; lg->port_id[2] = domain; lg->vp_index = vha->vp_idx; - - rval = qla2x00_issue_iocb(vha, lg, lg_dma, 0); + rval = qla2x00_issue_iocb_timeout(vha, lg, lg_dma, 0, + (ha->r_a_tov / 10 * 2) + 2); if (rval != QLA_SUCCESS) { ql_dbg(ql_dbg_mbx, vha, 0x106f, "Failed to issue logout IOCB (%x).\n", rval);