]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
qla2xxx: Hard code the number of loop entries at 128.
authorChad Dupuis <chad.dupuis@qlogic.com>
Fri, 13 Jan 2012 15:08:35 +0000 (09:08 -0600)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Wed, 9 May 2012 00:40:59 +0000 (17:40 -0700)
Do not use ha->max_fibre_devices in loop topology since the maximum number of
entries will always be 128 and so we don't have to worry about changing
ha->max_fibre_devices back.

JIRA Key: V2632FC-146

drivers/scsi/qla2xxx/qla_init.c

index e0a7736fbf703d385d3e1831b98a6a20c39260b3..2d9b5cb4577a929014d6cd3f45028cc1ff33f77b 100644 (file)
@@ -2575,15 +2575,8 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)
                        ql_dbg(ql_dbg_disc, vha, 0x2015,
                            "Loop resync needed, failing.\n");
                        rval = QLA_FUNCTION_FAILED;
-               } else {
-                       /*
-                        * Set the maximum number of targets to
-                        * MAX_FIBRE_DEVICE_LOOP only if we are an NL_PORT
-                        */
-                       if (ha->current_topology == ISP_CFG_NL)
-                               ha->max_fibre_devices = MAX_FIBRE_DEVICES_LOOP;
+               } else
                        rval = qla2x00_configure_local_loop(vha);
-               }
        }
 
        if (rval == QLA_SUCCESS && test_bit(RSCN_UPDATE, &flags)) {
@@ -2656,7 +2649,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
 
        found_devs = 0;
        new_fcport = NULL;
-       entries = ha->max_fibre_devices;
+       entries = MAX_FIBRE_DEVICES_LOOP;
 
        ql_dbg(ql_dbg_disc, vha, 0x2016,
            "Getting FCAL position map.\n");