[SCSI] qla2xxx: Reduce mbx-command timeout for Login/Logout requests.

Don't use default 30 second mailbox-command timeout for these
serial requests, instead, limit the TMO to the standard 2*RATOV
plus some fudge-factor.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 61e2fb75fbf0..5470177a1ee1 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/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);