scsi: qla2xxx: Delete session for nport id change

This patch fixes regression introduced by commit a4239945b8ad ("scsi:
qla2xxx: Add switch command to simplify fabric discovery") by scheduling
session deletion when Nport ID changes.

[mkp: clarified commit]

Fixes: a4239945b8ad ("scsi: qla2xxx: Add switch command to simplify fabric discovery")
Cc: <stable@vger.kernel.org>
Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 9e914f9c3ffb375b2a2fbba2cc9d8c38f8544c85..05abe5aaab7f5024ee4d4b2dea1d849eec7c655f 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -3915,7 +3915,6 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)
                        if (memcmp(rp->port_name, fcport->port_name, WWN_SIZE))
                                continue;
                        fcport->scan_state = QLA_FCPORT_FOUND;
-                       fcport->d_id.b24 = rp->id.b24;
                        found = true;
                        /*
                         * If device was not a fabric device before.
@@ -3923,7 +3922,10 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)
                        if ((fcport->flags & FCF_FABRIC_DEVICE) == 0) {
                                qla2x00_clear_loop_id(fcport);
                                fcport->flags |= FCF_FABRIC_DEVICE;
+                       } else if (fcport->d_id.b24 != rp->id.b24) {
+                               qlt_schedule_sess_for_deletion(fcport);
                        }
+                       fcport->d_id.b24 = rp->id.b24;
                        break;
                }