projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[deliverable/linux.git]
/
drivers
/
scsi
/
qla2xxx
/
qla_sup.c
diff --git
a/drivers/scsi/qla2xxx/qla_sup.c
b/drivers/scsi/qla2xxx/qla_sup.c
index 6260505dceb5ff20fc00e8305734453c08872a38..010e69b29afed1a89c89e5186798a1021c1872f4 100644
(file)
--- a/
drivers/scsi/qla2xxx/qla_sup.c
+++ b/
drivers/scsi/qla2xxx/qla_sup.c
@@
-945,7
+945,9
@@
qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)
DEBUG2(qla_printk(KERN_INFO, ha, "NPIV[%02x]: wwpn=%llx "
"wwnn=%llx vf_id=0x%x Q_qos=0x%x F_qos=0x%x.\n", cnt,
DEBUG2(qla_printk(KERN_INFO, ha, "NPIV[%02x]: wwpn=%llx "
"wwnn=%llx vf_id=0x%x Q_qos=0x%x F_qos=0x%x.\n", cnt,
- vid.port_name, vid.node_name, le16_to_cpu(entry->vf_id),
+ (unsigned long long)vid.port_name,
+ (unsigned long long)vid.node_name,
+ le16_to_cpu(entry->vf_id),
entry->q_qos, entry->f_qos));
if (i < QLA_PRECONFIG_VPORTS) {
entry->q_qos, entry->f_qos));
if (i < QLA_PRECONFIG_VPORTS) {
@@
-954,7
+956,8
@@
qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)
qla_printk(KERN_INFO, ha,
"NPIV-Config: Failed to create vport [%02x]: "
"wwpn=%llx wwnn=%llx.\n", cnt,
qla_printk(KERN_INFO, ha,
"NPIV-Config: Failed to create vport [%02x]: "
"wwpn=%llx wwnn=%llx.\n", cnt,
- vid.port_name, vid.node_name);
+ (unsigned long long)vid.port_name,
+ (unsigned long long)vid.node_name);
}
}
done:
}
}
done:
This page took
0.024675 seconds
and
5
git commands to generate.