---
 drivers/scsi/lpfc/lpfc_ct.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 61a32cd..5091184 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -1070,12 +1070,29 @@ lpfc_vport_symbolic_node_name(struct lpfc_vport *vport, 
char *symbol,
        size_t size)
 {
        char fwrev[FW_REV_STR_SIZE];
-       int n;
+       int n = 0;
 
        lpfc_decode_firmware_rev(vport->phba, fwrev, 0);
 
-       n = snprintf(symbol, size, "Emulex %s FV%s DV%s",
-               vport->phba->ModelName, fwrev, lpfc_release_version);
+       n = snprintf(symbol, size, "Emulex %s", vport->phba->ModelName);
+
+       if (size < n)
+               return n;
+       n += snprintf(symbol + n, size - n, " FV%s", fwrev);
+
+       if (size < n)
+               return n;
+       n += snprintf(symbol + n, size - n, " DV%s", lpfc_release_version);
+
+       if (size < n)
+               return n;
+       n += snprintf(symbol + n, size - n, " HN:%s", init_utsname()->nodename);
+
+       /* Note :- OS name is "Linux" as per requirement BZ168199. */
+       if (size < n)
+               return n;
+       n += snprintf(symbol + n, size - n, " OS:%s", init_utsname()->sysname);
+
        return n;
 }
 
-- 
1.7.11.7

Signed-off-by: James Smart <james.sm...@emulex.com>
Signed-off-by: Dick Kennedy <dick.kenn...@emulex.com>



--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to