qla2xxx: Correct link-reset regressions introduced during 83xx porting.

- flags.enable_lip_reset should not be set for 24xx/81xx (in
  corresponding nvram_config() functions).

- ISP2031 is *not* a CNA, remove comparison check against that
  ISP in qla2x00_lip_reset().

JIRA Key: V2632FC-159

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 72d81b52c4df15d51b0a8def80cfc93af1ebdc28..8a4afc3eda0cc31ce9b2009499d87aa45808a72d 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -4383,7 +4383,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
 
        /* Set host adapter parameters. */
        ha->flags.disable_risc_code_load = 0;
-       ha->flags.enable_lip_reset = 1;
+       ha->flags.enable_lip_reset = 0;
        ha->flags.enable_lip_full_login =
            le32_to_cpu(nv->host_p) & BIT_10 ? 1: 0;
        ha->flags.enable_target_reset =
@@ -5151,7 +5151,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
 
        /* Set host adapter parameters. */
        ha->flags.disable_risc_code_load = 0;
-       ha->flags.enable_lip_reset = 1;
+       ha->flags.enable_lip_reset = 0;
        ha->flags.enable_lip_full_login =
            le32_to_cpu(nv->host_p) & BIT_10 ? 1: 0;
        ha->flags.enable_target_reset =

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 5dba6e6a05efedf0d2806623065e86adefcc1241..9d9e85bb515602bdd9a228ed72126eb00775f2ff 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -1525,7 +1525,7 @@ qla2x00_lip_reset(scsi_qla_host_t *vha)
 
        ql_dbg(ql_dbg_mbx, vha, 0x105a, "Entered %s.\n", __func__);
 
-       if (IS_CNA_CAPABLE(vha->hw) || IS_QLA2031(vha->hw)) {
+       if (IS_CNA_CAPABLE(vha->hw)) {
                /* Logout across all FCFs. */
                mcp->mb[0] = MBC_LIP_FULL_LOGIN;
                mcp->mb[1] = BIT_1;