From 99afeb0750ad121244d068155e821d53a79f609e Mon Sep 17 00:00:00 2001 From: James Smart Date: Sat, 29 Sep 2012 11:32:09 -0400 Subject: [PATCH] --- yaml --- r: 334127 b: refs/heads/master c: 4169d868bef8440eaa1e08abfdc205d1269bf9d1 h: refs/heads/master i: 334125: f982c03c1038c432e0c867eb24046d65c1d7956f 334123: 00827a879c874aebca973ca18ecf9a6b9fe404cb 334119: a85762d47a5e5a45a5c84061831e3a72d39d113a 334111: 0544733822fbecdcff6f1b2d14ea78394df989c9 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/lpfc/lpfc_init.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 767c5a4bd49c..e2df0d81a0d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26979cedb05ecc2f6ae69c307058ccb510ac17f1 +refs/heads/master: 4169d868bef8440eaa1e08abfdc205d1269bf9d1 diff --git a/trunk/drivers/scsi/lpfc/lpfc_init.c b/trunk/drivers/scsi/lpfc/lpfc_init.c index c28b02a503dd..5a10acd4cdee 100644 --- a/trunk/drivers/scsi/lpfc/lpfc_init.c +++ b/trunk/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",