[PATCH 06/12] qla2xxx: Fix redundant fc_rport registration

[Himanshu Madhani]

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

Prevent multiple registration with transport layer for
the same remote port.

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

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 0fae17d1aaea..530d6e72d974 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5169,19 +5169,11 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t 
*fcport)
        if (IS_SW_RESV_ADDR(fcport->d_id))
                return;
 
-       ql_dbg(ql_dbg_disc, vha, 0x20ef, "%s %8phC\n",
-           __func__, fcport->port_name);
-
-       if (IS_QLAFX00(vha->hw)) {
-               qla2x00_set_fcport_state(fcport, FCS_ONLINE);
-       } else {
-               fcport->flags &= ~(FCF_LOGIN_NEEDED | FCF_ASYNC_SENT);
-               fcport->disc_state = DSC_LOGIN_COMPLETE;
-               fcport->deleted = 0;
-               fcport->logout_on_delete = 1;
-               fcport->login_retry = vha->hw->login_retry_count;
-               qla2x00_set_fcport_state(fcport, FCS_ONLINE);
-       }
+       fcport->flags &= ~(FCF_LOGIN_NEEDED | FCF_ASYNC_SENT);
+       fcport->disc_state = DSC_LOGIN_COMPLETE;
+       fcport->deleted = 0;
+       fcport->logout_on_delete = 1;
+       fcport->login_retry = vha->hw->login_retry_count;
 
        qla2x00_set_fcport_state(fcport, FCS_ONLINE);
        qla2x00_iidma_fcport(vha, fcport);
-- 
2.12.0