git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 087c621e22f49c326cdc65d98c6fc0737ac13533 Mon Sep 17 00:00:00 2001
   2 From: Andrew Vasquez <andrew.vasquez@qlogic.com>
   3 Date: Tue, 23 Nov 2010 16:52:48 -0800
   4 Subject: [SCSI] qla2xxx: Correct issue where NPIV-config data was not being allocated for 82xx parts.
   5
   6 From: Andrew Vasquez <andrew.vasquez@qlogic.com>
   7
   8 commit 087c621e22f49c326cdc65d98c6fc0737ac13533 upstream.
   9
  10 This would cause a panic while reading the NPIV-config data.
  11
  12 Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
  13 Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
  14 Signed-off-by: James Bottomley <James.Bottomley@suse.de>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  16
  17 ---
  18  drivers/scsi/qla2xxx/qla_os.c |    1 +
  19  1 file changed, 1 insertion(+)
  20
  21 --- a/drivers/scsi/qla2xxx/qla_os.c
  22 +++ b/drivers/scsi/qla2xxx/qla_os.c
  23 @@ -2095,6 +2095,7 @@ qla2x00_probe_one(struct pci_dev *pdev,
  24                 ha->init_cb_size = sizeof(struct mid_init_cb_81xx);
  25                 ha->gid_list_info_size = 8;
  26                 ha->optrom_size = OPTROM_SIZE_82XX;
  27 +               ha->nvram_npiv_size = QLA_MAX_VPORTS_QLA25XX;
  28                 ha->isp_ops = &qla82xx_isp_ops;
  29                 ha->flash_conf_off = FARX_ACCESS_FLASH_CONF;
  30                 ha->flash_data_off = FARX_ACCESS_FLASH_DATA;