From: Chad Dupuis <chad.dupuis@qlogic.com>
Date: Fri, 13 Jan 2012 15:08:35 +0000 (-0600)
Subject: qla2xxx: Hard code the number of loop entries at 128.
X-Git-Tag: v2.6.39-400.9.0~423^2~76
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=16c0637779b3d80a3e49790e035f40c94b87a027;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: Hard code the number of loop entries at 128.

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
---

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index e0a7736fbf70..2d9b5cb4577a 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -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");