1 From 680d7db88ace53c673e1c437c9b6abcc053e8d6f Mon Sep 17 00:00:00 2001
2 From: Shyam Sundar <shyam.sundar@qlogic.com>
3 Date: Fri, 24 Oct 2008 15:13:46 -0700
4 Subject: revert - SCSI: qla2xxx: Do not honour max_vports from firmware for 2G ISPs and below.
7 This is a revert of this patch that is included in 2.6.27.7
8 as a further qla2xxx driver update in the series conflicts with this
12 From: Shyam Sundar <shyam.sundar@qlogic.com>
14 commit 680d7db88ace53c673e1c437c9b6abcc053e8d6f upstream.
16 For 23XX ISPs, max_vports may return an invalid value.
19 Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
20 Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
21 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
26 drivers/scsi/qla2xxx/qla_init.c | 2 +-
27 drivers/scsi/qla2xxx/qla_mbx.c | 2 +-
28 2 files changed, 2 insertions(+), 2 deletions(-)
30 --- a/drivers/scsi/qla2xxx/qla_init.c
31 +++ b/drivers/scsi/qla2xxx/qla_init.c
32 @@ -974,6 +974,7 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
33 &ha->fw_minor_version,
34 &ha->fw_subminor_version,
35 &ha->fw_attributes, &ha->fw_memory_size);
36 + qla2x00_resize_request_q(ha);
37 ha->flags.npiv_supported = 0;
38 if ((IS_QLA24XX(ha) || IS_QLA25XX(ha) ||
40 @@ -985,7 +986,6 @@ qla2x00_setup_chip(scsi_qla_host_t *ha)
42 MIN_MULTI_ID_FABRIC - 1;
44 - qla2x00_resize_request_q(ha);
47 qla2x00_alloc_fw_dump(ha);
48 --- a/drivers/scsi/qla2xxx/qla_mbx.c
49 +++ b/drivers/scsi/qla2xxx/qla_mbx.c
50 @@ -1964,7 +1964,7 @@ qla2x00_get_resource_cnts(scsi_qla_host_
51 *cur_iocb_cnt = mcp->mb[7];
53 *orig_iocb_cnt = mcp->mb[10];
54 - if (ha->flags.npiv_supported && max_npiv_vports)
55 + if (max_npiv_vports)
56 *max_npiv_vports = mcp->mb[11];