diff options
| author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2007-10-19 15:59:19 -0700 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-10-23 15:54:54 -0400 |
| commit | 8b7afc2a90d93d87d53732a9281c22facebe8d62 (patch) | |
| tree | d8f249917de744a666a125872a0561dac5c7519b /drivers/scsi | |
| parent | 6acf8190025e9c4ea513d4084ff089d476112816 (diff) | |
| download | kernel_samsung_smdk4412-8b7afc2a90d93d87d53732a9281c22facebe8d62.zip kernel_samsung_smdk4412-8b7afc2a90d93d87d53732a9281c22facebe8d62.tar.gz kernel_samsung_smdk4412-8b7afc2a90d93d87d53732a9281c22facebe8d62.tar.bz2 | |
[SCSI] qla2xxx: Correct display of ISP serial-number.
The original serial-number calculations based on WWPN no longer
apply to newer ISPs (ISP24xx and ISP25xx). These newer board's
serial number reside in the VPD.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_attr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index 2f0bd5a..fb388b8 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c @@ -538,6 +538,9 @@ qla2x00_serial_num_show(struct class_device *cdev, char *buf) scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev)); uint32_t sn; + if (IS_FWI2_CAPABLE(ha)) + return snprintf(buf, PAGE_SIZE, "\n"); + sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | ha->serial1; return snprintf(buf, PAGE_SIZE, "%c%05d\n", 'A' + sn / 100000, sn % 100000); |