]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
[SCSI] qla2xxx: Correct issue where NPIV-config data was not being allocated for...
authorAndrew Vasquez <andrew.vasquez@qlogic.com>
Wed, 24 Nov 2010 00:52:48 +0000 (16:52 -0800)
committerJames Bottomley <James.Bottomley@suse.de>
Thu, 9 Dec 2010 19:25:21 +0000 (13:25 -0600)
This would cause a panic while reading the NPIV-config data.

Cc: stable@kernel.org
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>
drivers/scsi/qla2xxx/qla_os.c

index 1644eabaafeb58cb3130dccdb97b489bcd0c708e..b8731567aea56f7c9a6777e5112a3db1b13a6485 100644 (file)
@@ -2064,6 +2064,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                ha->init_cb_size = sizeof(struct mid_init_cb_81xx);
                ha->gid_list_info_size = 8;
                ha->optrom_size = OPTROM_SIZE_82XX;
+               ha->nvram_npiv_size = QLA_MAX_VPORTS_QLA25XX;
                ha->isp_ops = &qla82xx_isp_ops;
                ha->flash_conf_off = FARX_ACCESS_FLASH_CONF;
                ha->flash_data_off = FARX_ACCESS_FLASH_DATA;