[SCSI] lpfc 8.3.35: Fixed SCSI host create showing wrong link speed on SLI3 HBA ports

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 954be0f300d9a95a6354fa2e50ce7953b5619cef..4261b43a5c2d29eab5be2381140211d4d8118a09 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1882,8 +1882,10 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
                max_speed = 4;
        else if (phba->lmt & LMT_2Gb)
                max_speed = 2;
-       else
+       else if (phba->lmt & LMT_1Gb)
                max_speed = 1;
+       else
+               max_speed = 0;
 
        vp = &phba->vpd;
 
@@ -2068,9 +2070,13 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
        if (descp && descp[0] == '\0') {
                if (oneConnect)
                        snprintf(descp, 255,
-                               "Emulex OneConnect %s, %s Initiator, Port %s",
+                               "Emulex OneConnect %s, %s Initiator %s",
                                m.name, m.function,
                                phba->Port);
+               else if (max_speed == 0)
+                       snprintf(descp, 255,
+                               "Emulex %s %s %s ",
+                               m.name, m.bus, m.function);
                else
                        snprintf(descp, 255,
                                "Emulex %s %d%s %s %s",