diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 20:02:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 20:02:18 -0700 |
commit | 35d91f75c2c9548e606e813413f03c5cc35da969 (patch) | |
tree | 2a1a3f32320409303247a72ead35107c271abb17 /drivers/scsi/qla2xxx/qla_init.c | |
parent | 9401c705f2a6a7e5df102f6443dba395c3c5e5a8 (diff) | |
parent | 70c83e110541e894fa16aee0f57bcf4207b33e7b (diff) | |
download | talos-op-linux-35d91f75c2c9548e606e813413f03c5cc35da969.tar.gz talos-op-linux-35d91f75c2c9548e606e813413f03c5cc35da969.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_init.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index c619583e646b..3e9b64137873 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -2066,8 +2066,8 @@ qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport) return; } - rport_ids.node_name = be64_to_cpu(*(uint64_t *)fcport->node_name); - rport_ids.port_name = be64_to_cpu(*(uint64_t *)fcport->port_name); + rport_ids.node_name = wwn_to_u64(fcport->node_name); + rport_ids.port_name = wwn_to_u64(fcport->port_name); rport_ids.port_id = fcport->d_id.b.domain << 16 | fcport->d_id.b.area << 8 | fcport->d_id.b.al_pa; rport_ids.roles = FC_RPORT_ROLE_UNKNOWN; |