From: Andrew Vasquez Date: Wed, 24 Nov 2010 00:52:48 +0000 (-0800) Subject: qla2xxx: Correct issue where NPIV-config data was not being allocated for 82xx parts. X-Git-Tag: v2.6.36.3~118 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=326212701ed2adbb83e4f6a23f48f84c54bbf456;p=karo-tx-linux.git qla2xxx: Correct issue where NPIV-config data was not being allocated for 82xx parts. commit 087c621e22f49c326cdc65d98c6fc0737ac13533 upstream. This would cause a panic while reading the NPIV-config data. Signed-off-by: Andrew Vasquez Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 4e29d43cdbdf..202a31ab2f18 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -2095,6 +2095,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;