Fixed SLI4 FC port internal loopback without SFP and external link/loopback plug...

When performing internal loopback diagnostic test on LPe16000 port without SFP
present or without external link/loopback plug plugged in, internal loopback on
port1 failed. Instead of using the link type and link number obtained reported
from the asynchronous link event, used the link type and link number obtained
from the READ_CONFIG mailbox command from SLI4 setup routine , which will not
depend on an external link or loopback plug present.

commit id: 1b51197d0fd0c06877c6df1bba84ac4008a7fc60

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index a8c12a065dbaa22a8e716bcaf26d26f71746d8b5..27d3ff8f1af04cc40dc21251df9cc9e649345d04 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -1766,9 +1766,9 @@ lpfc_sli4_bsg_set_internal_loopback(struct lpfc_hba *phba)
        }
        link_diag_loopback = &pmboxq->u.mqe.un.link_diag_loopback;
        bf_set(lpfc_mbx_set_diag_state_link_num,
-              &link_diag_loopback->u.req, phba->sli4_hba.link_state.number);
+              &link_diag_loopback->u.req, phba->sli4_hba.lnk_info.lnk_no);
        bf_set(lpfc_mbx_set_diag_state_link_type,
-              &link_diag_loopback->u.req, phba->sli4_hba.link_state.type);
+              &link_diag_loopback->u.req, phba->sli4_hba.lnk_info.lnk_tp);
        bf_set(lpfc_mbx_set_diag_lpbk_type, &link_diag_loopback->u.req,
               LPFC_DIAG_LOOPBACK_TYPE_SERDES);