scsi: qla2xxx: Consolidate fabric scan

Consolidate scan for fabric loop and fabric topologies into a single scan.

Link: https://lore.kernel.org/r/20191217220617.28084-11-hmadhani@marvell.com
Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 77e54e7a31d6cde5e6c6bf7d6e2ea0a5477a2b2f..4f849b12b546891f9d573d0db99f26a0d20f81b2 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -4939,12 +4939,8 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)
        qla2x00_get_data_rate(vha);
 
        /* Determine what we need to do */
-       if (ha->current_topology == ISP_CFG_FL &&
-           (test_bit(LOCAL_LOOP_UPDATE, &flags))) {
-
-               set_bit(RSCN_UPDATE, &flags);
-
-       } else if (ha->current_topology == ISP_CFG_F &&
+       if ((ha->current_topology == ISP_CFG_FL ||
+           ha->current_topology == ISP_CFG_F) &&
            (test_bit(LOCAL_LOOP_UPDATE, &flags))) {
 
                set_bit(RSCN_UPDATE, &flags);