summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLalit Chandivade <lalit.chandivade@qlogic.com>2012-02-13 18:30:41 +0530
committerJames Bottomley <JBottomley@Parallels.com>2012-02-19 09:31:18 -0600
commit981c982c2d739940d36ab535047a471943787c93 (patch)
tree320437adfbee1062887380650db8d33edffd7e8b /drivers
parent45857216f2a513872efc965f66bca21ace0980fd (diff)
downloadblackbird-op-linux-981c982c2d739940d36ab535047a471943787c93.tar.gz
blackbird-op-linux-981c982c2d739940d36ab535047a471943787c93.zip
[SCSI] qla4xxx: Fix un-necessary delay on invalid DDB
Fix the un-necessary wait for completion of a sendtarget on an invalid DDB entry. The state of an invalid DDB entry is 0 (unassigned) This will also avoid the delays during system boot. Signed-off-by: Lalit Chandivade <lalit.chandivade@qlogic.com> Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/qla4xxx/ql4_mbx.c2
-rw-r--r--drivers/scsi/qla4xxx/ql4_os.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index e1e66a45e4d0..eaf21852887c 100644
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -661,6 +661,8 @@ int qla4xxx_get_fwddb_entry(struct scsi_qla_host *ha,
}
memset(&mbox_cmd, 0, sizeof(mbox_cmd));
memset(&mbox_sts, 0, sizeof(mbox_sts));
+ if (fw_ddb_entry)
+ memset(fw_ddb_entry, 0, sizeof(struct dev_db_entry));
mbox_cmd[0] = MBOX_CMD_GET_DATABASE_ENTRY;
mbox_cmd[1] = (uint32_t) fw_ddb_index;
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index c1189e5fab14..089443add47f 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -4090,6 +4090,10 @@ static void qla4xxx_build_st_list(struct scsi_qla_host *ha,
if (ret == QLA_ERROR)
break;
+ /* Ignore DDB if invalid state (unassigned) */
+ if (state == DDB_DS_UNASSIGNED)
+ goto continue_next_st;
+
/* Check if ST, add to the list_st */
if (strlen((char *) fw_ddb_entry->iscsi_name) != 0)
goto continue_next_st;
OpenPOWER on IntegriCloud