diff options
author | Andrew Morton <akpm@osdl.org> | 2005-09-21 12:46:54 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-09-21 17:25:46 -0400 |
commit | 68ce1eb54056e4fad6e73968e958b926d28cb0dd (patch) | |
tree | c960d7488ba1888b7e01a5b4bd68590d2b3bbe71 /drivers/scsi/lpfc/lpfc_attr.c | |
parent | a418500b42c5c54f3f9d68036950c701740a2765 (diff) |
[SCSI] lpfc build fix
gcc-2.95.x doesn't do anonymous unions.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_attr.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_attr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index 86eaf6d408d5..acae7c48ef7d 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c | |||
@@ -973,10 +973,10 @@ lpfc_get_host_fabric_name (struct Scsi_Host *shost) | |||
973 | if ((phba->fc_flag & FC_FABRIC) || | 973 | if ((phba->fc_flag & FC_FABRIC) || |
974 | ((phba->fc_topology == TOPOLOGY_LOOP) && | 974 | ((phba->fc_topology == TOPOLOGY_LOOP) && |
975 | (phba->fc_flag & FC_PUBLIC_LOOP))) | 975 | (phba->fc_flag & FC_PUBLIC_LOOP))) |
976 | node_name = wwn_to_u64(phba->fc_fabparam.nodeName.wwn); | 976 | node_name = wwn_to_u64(phba->fc_fabparam.nodeName.u.wwn); |
977 | else | 977 | else |
978 | /* fabric is local port if there is no F/FL_Port */ | 978 | /* fabric is local port if there is no F/FL_Port */ |
979 | node_name = wwn_to_u64(phba->fc_nodename.wwn); | 979 | node_name = wwn_to_u64(phba->fc_nodename.u.wwn); |
980 | 980 | ||
981 | spin_unlock_irq(shost->host_lock); | 981 | spin_unlock_irq(shost->host_lock); |
982 | 982 | ||
@@ -1110,7 +1110,7 @@ lpfc_get_starget_node_name(struct scsi_target *starget) | |||
1110 | /* Search the mapped list for this target ID */ | 1110 | /* Search the mapped list for this target ID */ |
1111 | list_for_each_entry(ndlp, &phba->fc_nlpmap_list, nlp_listp) { | 1111 | list_for_each_entry(ndlp, &phba->fc_nlpmap_list, nlp_listp) { |
1112 | if (starget->id == ndlp->nlp_sid) { | 1112 | if (starget->id == ndlp->nlp_sid) { |
1113 | node_name = wwn_to_u64(ndlp->nlp_nodename.wwn); | 1113 | node_name = wwn_to_u64(ndlp->nlp_nodename.u.wwn); |
1114 | break; | 1114 | break; |
1115 | } | 1115 | } |
1116 | } | 1116 | } |
@@ -1131,7 +1131,7 @@ lpfc_get_starget_port_name(struct scsi_target *starget) | |||
1131 | /* Search the mapped list for this target ID */ | 1131 | /* Search the mapped list for this target ID */ |
1132 | list_for_each_entry(ndlp, &phba->fc_nlpmap_list, nlp_listp) { | 1132 | list_for_each_entry(ndlp, &phba->fc_nlpmap_list, nlp_listp) { |
1133 | if (starget->id == ndlp->nlp_sid) { | 1133 | if (starget->id == ndlp->nlp_sid) { |
1134 | port_name = wwn_to_u64(ndlp->nlp_portname.wwn); | 1134 | port_name = wwn_to_u64(ndlp->nlp_portname.u.wwn); |
1135 | break; | 1135 | break; |
1136 | } | 1136 | } |
1137 | } | 1137 | } |