diff options
author | Saurav Kashyap <saurav.kashyap@qlogic.com> | 2013-02-08 01:57:43 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-02-22 12:17:38 +0000 |
commit | a865c50a64f1c0c27fc0be0652b6a352f537cb6f (patch) | |
tree | bef7ac6c56fea1b456bd7056f83f3864118a2cc6 /drivers/scsi/qla2xxx/qla_sup.c | |
parent | 0b7e7c53307de217cfc7eeb036c9b8b013d67fcc (diff) | |
download | op-kernel-dev-a865c50a64f1c0c27fc0be0652b6a352f537cb6f.zip op-kernel-dev-a865c50a64f1c0c27fc0be0652b6a352f537cb6f.tar.gz |
[SCSI] qla2xxx: Get VPD information from common location for CNA.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_sup.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_sup.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c index 32fdc2a..f5a1a56 100644 --- a/drivers/scsi/qla2xxx/qla_sup.c +++ b/drivers/scsi/qla2xxx/qla_sup.c @@ -798,20 +798,8 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr) case FLT_REG_BOOTLOAD_82XX: ha->flt_region_bootload = start; break; - case FLT_REG_VPD_82XX: - ha->flt_region_vpd = start; - break; - case FLT_REG_FCOE_VPD_0: - if (!IS_QLA8031(ha)) - break; - ha->flt_region_vpd_nvram = start; - if (ha->flags.port0) - ha->flt_region_vpd = start; - break; - case FLT_REG_FCOE_VPD_1: - if (!IS_QLA8031(ha)) - break; - if (!ha->flags.port0) + case FLT_REG_VPD_8XXX: + if (IS_CNA_CAPABLE(ha)) ha->flt_region_vpd = start; break; case FLT_REG_FCOE_NVRAM_0: |