diff options
author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2010-12-21 19:00:16 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-12-23 16:44:28 -0500 |
commit | ff8073fffc708a4959c2dd159c834f2516ce9703 (patch) | |
tree | c8e99e185c2f00aa7438819829fa3dc84bb49a6a /drivers/scsi | |
parent | 8ae598d02517af967685a671303c4ed10cded3c4 (diff) |
[SCSI] qla2xxx: Populate FCP_PRIO location for no *FLT* case
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_sup.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c index 76de9574b385..22070621206c 100644 --- a/drivers/scsi/qla2xxx/qla_sup.c +++ b/drivers/scsi/qla2xxx/qla_sup.c | |||
@@ -669,6 +669,13 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr) | |||
669 | def = 1; | 669 | def = 1; |
670 | else if (IS_QLA81XX(ha)) | 670 | else if (IS_QLA81XX(ha)) |
671 | def = 2; | 671 | def = 2; |
672 | |||
673 | /* Assign FCP prio region since older adapters may not have FLT, or | ||
674 | FCP prio region in it's FLT. | ||
675 | */ | ||
676 | ha->flt_region_fcp_prio = ha->flags.port0 ? | ||
677 | fcp_prio_cfg0[def] : fcp_prio_cfg1[def]; | ||
678 | |||
672 | ha->flt_region_flt = flt_addr; | 679 | ha->flt_region_flt = flt_addr; |
673 | wptr = (uint16_t *)req->ring; | 680 | wptr = (uint16_t *)req->ring; |
674 | flt = (struct qla_flt_header *)req->ring; | 681 | flt = (struct qla_flt_header *)req->ring; |
@@ -696,10 +703,6 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr) | |||
696 | goto no_flash_data; | 703 | goto no_flash_data; |
697 | } | 704 | } |
698 | 705 | ||
699 | /* Assign FCP prio region since older FLT's may not have it */ | ||
700 | ha->flt_region_fcp_prio = ha->flags.port0 ? | ||
701 | fcp_prio_cfg0[def] : fcp_prio_cfg1[def]; | ||
702 | |||
703 | loc = locations[1]; | 706 | loc = locations[1]; |
704 | cnt = le16_to_cpu(flt->length) / sizeof(struct qla_flt_region); | 707 | cnt = le16_to_cpu(flt->length) / sizeof(struct qla_flt_region); |
705 | for ( ; cnt; cnt--, region++) { | 708 | for ( ; cnt; cnt--, region++) { |