[PATCH v2 08/16] qla2xxx: Fix session state stuck in Get Port DB

[Himanshu Madhani]

From: Quinn Tran <quinn.t...@cavium.com>

This patch sets discovery state back to GNL (Get
Name List) when session is stuck at GPDB (Get Port
DataBase). This will allow state machine to retry
login and move session state ahead in discovery.

Signed-off-by: Quinn Tran <quinn.t...@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madh...@cavium.com>
---
 drivers/scsi/qla2xxx/qla_init.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 4a89aa93c315..f94335301c70 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1152,9 +1152,12 @@ void qla24xx_handle_gpdb_event(scsi_qla_host_t *vha, 
struct event_arg *ea)
        case PDS_PLOGI_COMPLETE:
        case PDS_PRLI_PENDING:
        case PDS_PRLI2_PENDING:
-               ql_dbg(ql_dbg_disc, vha, 0x20d5, "%s %d %8phC relogin needed\n",
-                   __func__, __LINE__, fcport->port_name);
-               set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
+               /* Set discovery state back to GNL to Relogin attempt */
+               if (qla_dual_mode_enabled(vha) ||
+                   qla_ini_mode_enabled(vha)) {
+                       fcport->disc_state = DSC_GNL;
+                       set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
+               }
                return;
        case PDS_LOGO_PENDING:
        case PDS_PORT_UNAVAILABLE:
-- 
2.12.0