Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 334127
b: refs/heads/master
c: 4169d86
h: refs/heads/master
i:
  334125: f982c03
  334123: 00827a8
  334119: a85762d
  334111: 0544733
v: v3
  • Loading branch information
James Smart authored and James Bottomley committed Oct 8, 2012
1 parent d8b4519 commit 99afeb0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 26979cedb05ecc2f6ae69c307058ccb510ac17f1
refs/heads/master: 4169d868bef8440eaa1e08abfdc205d1269bf9d1
10 changes: 8 additions & 2 deletions trunk/drivers/scsi/lpfc/lpfc_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 99afeb0

Please sign in to comment.