[SCSI] qla2xxx: Add test for valid loop id to qla2x00_relogin().

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / qla2xxx / qla_os.c

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 2f039e018eefa95833330de9e8e259d08555cc79..d1b29dc9cba192c4ede3956d0f72f10d767fd84e 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3214,6 +3214,17 @@ void qla2x00_relogin(struct scsi_qla_host *vha)
                                                        fcport->d_id.b.area,
                                                        fcport->d_id.b.al_pa);
 
+                               if (fcport->loop_id == FC_NO_LOOP_ID) {
+                                       fcport->loop_id = next_loopid =
+                                           ha->min_external_loopid;
+                                       status = qla2x00_find_new_loop_id(
+                                           vha, fcport);
+                                       if (status != QLA_SUCCESS) {
+                                               /* Ran out of IDs to use */
+                                               break;
+                                       }
+                               }
+
                                if (IS_ALOGIO_CAPABLE(ha)) {
                                        fcport->flags |= FCF_ASYNC_SENT;
                                        data[0] = 0;