diff options
| author | James Smart <james.smart@emulex.com> | 2015-04-07 21:07:18 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-04-10 16:48:45 +0200 |
| commit | f0bf5f91908f7c8819d4111c7bd793178021aa3f (patch) | |
| tree | 564bcf9e24f6afca9808e229fce019dc53b9bf4c /drivers/scsi | |
| parent | lpfc: Parse the new 20G, 25G and 40G link speeds in the lpfc driver (diff) | |
| download | linux-f0bf5f91908f7c8819d4111c7bd793178021aa3f.tar.xz linux-f0bf5f91908f7c8819d4111c7bd793178021aa3f.zip | |
lpfc: Fix provide host name and OS name in RSNN-NN FC-GS command
Signed-off-by: Dick Kennedy <dick.kennedy@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_ct.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c index 61a32cd23f79..5fb431a51588 100644 --- a/drivers/scsi/lpfc/lpfc_ct.c +++ b/drivers/scsi/lpfc/lpfc_ct.c @@ -1074,8 +1074,25 @@ lpfc_vport_symbolic_node_name(struct lpfc_vport *vport, char *symbol, 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" */ + if (size < n) + return n; + n += snprintf(symbol + n, size - n, " OS:%s", init_utsname()->sysname); + return n; } |