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

If fabric device has invalid loop id (FC_NO_LOOP_ID) then call
qla2x00_find_new_loop_id() to attempt to obtain valid loop id.

Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 2f039e018ee..d1b29dc9cba 100644
--- 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;