scsi: qla2xxx: fix rports not being mark as lost in sync fabric scan
authorMartin Wilck <mwilck@suse.com>
Fri, 22 Nov 2019 22:19:22 +0000 (22:19 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Jan 2020 07:22:59 +0000 (08:22 +0100)
commit d341e9a8f2cffe4000c610225c629f62c7489c74 upstream.

In qla2x00_find_all_fabric_devs(), fcport->flags & FCF_LOGIN_NEEDED is a
necessary condition for logging into new rports, but not for dropping lost
ones.

Fixes: 726b85487067 ("qla2xxx: Add framework for async fabric discovery")
Link: https://lore.kernel.org/r/20191122221912.20100-2-martin.wilck@suse.com
Tested-by: David Bond <dbond@suse.com>
Signed-off-by: Martin Wilck <mwilck@suse.com>
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/qla2xxx/qla_init.c

index 80f276d..9ffaa92 100644 (file)
@@ -5891,8 +5891,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)
                if (test_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags))
                        break;
 
-               if ((fcport->flags & FCF_FABRIC_DEVICE) == 0 ||
-                   (fcport->flags & FCF_LOGIN_NEEDED) == 0)
+               if ((fcport->flags & FCF_FABRIC_DEVICE) == 0)
                        continue;
 
                if (fcport->scan_state == QLA_FCPORT_SCAN) {
@@ -5915,7 +5914,8 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha)
                        }
                }
 
-               if (fcport->scan_state == QLA_FCPORT_FOUND)
+               if (fcport->scan_state == QLA_FCPORT_FOUND &&
+                   (fcport->flags & FCF_LOGIN_NEEDED) != 0)
                        qla24xx_fcport_handle_login(vha, fcport);
        }
        return (rval);