Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c48339decceec8e011498b0fc4c7c7d8b2ea06c1
Commit:     c48339decceec8e011498b0fc4c7c7d8b2ea06c1
Parent:     fc44765f5a232d451fa58a04606b254ac257b429
Author:     Seokmann Ju <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 17 09:02:19 2008 -0800
Committer:  James Bottomley <[EMAIL PROTECTED]>
CommitDate: Wed Jan 23 11:29:33 2008 -0600

    [SCSI] qla2xxx: Issue correct MBC_INITIALIZE_FIRMWARE command.
    
    There is a case where 54xx HBA loads MID firmware as it use 24xx
    firmware. In this case, the driver should issue
    MBC_MID_INITIALIZE FIRMWARE even though the HBA doesn't support
    NPIV.  This patch make changes in the driver so that could behave
    accordingly.
    
    Signed-off-by: Seokmann Ju <[EMAIL PROTECTED]>
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
---
 drivers/scsi/qla2xxx/qla_init.c |    4 +++-
 drivers/scsi/qla2xxx/qla_mbx.c  |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 7637fa7..d0633ca 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1193,7 +1193,9 @@ qla2x00_init_rings(scsi_qla_host_t *ha)
 
        DEBUG(printk("scsi(%ld): Issue init firmware.\n", ha->host_no));
 
-       mid_init_cb->count = cpu_to_le16(ha->max_npiv_vports);
+       if (ha->flags.npiv_supported)
+               mid_init_cb->count = cpu_to_le16(ha->max_npiv_vports);
+
        mid_init_cb->options = __constant_cpu_to_le16(BIT_1);
 
        rval = qla2x00_init_firmware(ha, ha->init_cb_size);
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 99d29ff..0c10c0b 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -980,7 +980,7 @@ qla2x00_init_firmware(scsi_qla_host_t *ha, uint16_t size)
        DEBUG11(printk("qla2x00_init_firmware(%ld): entered.\n",
            ha->host_no));
 
-       if (ha->flags.npiv_supported)
+       if (ha->fw_attributes & BIT_2)
                mcp->mb[0] = MBC_MID_INITIALIZE_FIRMWARE;
        else
                mcp->mb[0] = MBC_INITIALIZE_FIRMWARE;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to