tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by Andrew Vasquez and committed by James Bottomley 8b7afc2a 6acf8190

+3
unified split
+3
drivers/scsi/qla2xxx/qla_attr.c
··· 538 538 scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev)); 539 539 uint32_t sn; 540 540 541 + if (IS_FWI2_CAPABLE(ha)) 542 + return snprintf(buf, PAGE_SIZE, "\n"); 543 + 541 544 sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | ha->serial1; 542 545 return snprintf(buf, PAGE_SIZE, "%c%05d\n", 'A' + sn / 100000, 543 546 sn % 100000);