diff options
| author |   James Smart <james.smart@emulex.com> | 2012-09-29 11:32:09 -0400 |
|---|---|---|
| committer |   James Bottomley <JBottomley@Parallels.com> | 2012-10-08 12:13:12 +0100 |
| commit | 4169d868bef8440eaa1e08abfdc205d1269bf9d1 (patch) | |
| tree | 9d45f92acf9f84b6d0b3d10c3df3b339112a792f /drivers/scsi/lpfc | |
| parent | [SCSI] lpfc 8.3.35: Fixed not checking solicition in progress bit when verifying FCF record for use (diff) | |
| download | linux-dev-4169d868bef8440eaa1e08abfdc205d1269bf9d1.tar.xz linux-dev-4169d868bef8440eaa1e08abfdc205d1269bf9d1.zip | |
[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>
Diffstat (limited to 'drivers/scsi/lpfc')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_init.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index c28b02a503dd..5a10acd4cdee 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -1892,8 +1892,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; @@ -2078,9 +2080,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", |