Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b7afc2a authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[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: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 6acf8190

drivers/scsi/qla2xxx/qla_attr.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -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));

	scsi_qla_host_t *ha = shost_priv(class_to_shost(cdev));

	uint32_t sn;

	uint32_t sn;





	if (IS_FWI2_CAPABLE(ha))

		return snprintf(buf, PAGE_SIZE, "\n");



	sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | ha->serial1;

	sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | ha->serial1;

	return snprintf(buf, PAGE_SIZE, "%c%05d\n", 'A' + sn / 100000,

	return snprintf(buf, PAGE_SIZE, "%c%05d\n", 'A' + sn / 100000,

	    sn % 100000);

	    sn % 100000);