diff options
Diffstat (limited to 'drivers/s390/scsi/zfcp_fc.h')
-rw-r--r-- | drivers/s390/scsi/zfcp_fc.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/s390/scsi/zfcp_fc.h b/drivers/s390/scsi/zfcp_fc.h index 9c787e043ff8..cb2a3669a384 100644 --- a/drivers/s390/scsi/zfcp_fc.h +++ b/drivers/s390/scsi/zfcp_fc.h | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <scsi/fc/fc_ns.h> | 15 | #include <scsi/fc/fc_ns.h> |
16 | #include <scsi/scsi_cmnd.h> | 16 | #include <scsi/scsi_cmnd.h> |
17 | #include <scsi/scsi_tcq.h> | 17 | #include <scsi/scsi_tcq.h> |
18 | #include "zfcp_fsf.h" | ||
18 | 19 | ||
19 | #define ZFCP_FC_CT_SIZE_PAGE (PAGE_SIZE - sizeof(struct fc_ct_hdr)) | 20 | #define ZFCP_FC_CT_SIZE_PAGE (PAGE_SIZE - sizeof(struct fc_ct_hdr)) |
20 | #define ZFCP_FC_GPN_FT_ENT_PAGE (ZFCP_FC_CT_SIZE_PAGE \ | 21 | #define ZFCP_FC_GPN_FT_ENT_PAGE (ZFCP_FC_CT_SIZE_PAGE \ |
@@ -55,7 +56,7 @@ struct zfcp_fc_gid_pn_resp { | |||
55 | * @gid_pn_resp: GID_PN response data | 56 | * @gid_pn_resp: GID_PN response data |
56 | */ | 57 | */ |
57 | struct zfcp_fc_gid_pn { | 58 | struct zfcp_fc_gid_pn { |
58 | struct zfcp_send_ct ct; | 59 | struct zfcp_fsf_ct_els ct; |
59 | struct scatterlist sg_req; | 60 | struct scatterlist sg_req; |
60 | struct scatterlist sg_resp; | 61 | struct scatterlist sg_resp; |
61 | struct zfcp_fc_gid_pn_req gid_pn_req; | 62 | struct zfcp_fc_gid_pn_req gid_pn_req; |
@@ -90,7 +91,7 @@ struct zfcp_fc_gpn_ft_resp { | |||
90 | * @sg_resp: scatter list entries for gpn_ft responses (per memory page) | 91 | * @sg_resp: scatter list entries for gpn_ft responses (per memory page) |
91 | */ | 92 | */ |
92 | struct zfcp_fc_gpn_ft { | 93 | struct zfcp_fc_gpn_ft { |
93 | struct zfcp_send_ct ct; | 94 | struct zfcp_fsf_ct_els ct; |
94 | struct scatterlist sg_req; | 95 | struct scatterlist sg_req; |
95 | struct scatterlist sg_resp[ZFCP_FC_GPN_FT_NUM_BUFS]; | 96 | struct scatterlist sg_resp[ZFCP_FC_GPN_FT_NUM_BUFS]; |
96 | }; | 97 | }; |
@@ -104,7 +105,7 @@ struct zfcp_fc_gpn_ft { | |||
104 | * @adisc_resp: ELS ADISC response data | 105 | * @adisc_resp: ELS ADISC response data |
105 | */ | 106 | */ |
106 | struct zfcp_fc_els_adisc { | 107 | struct zfcp_fc_els_adisc { |
107 | struct zfcp_send_els els; | 108 | struct zfcp_fsf_ct_els els; |
108 | struct scatterlist req; | 109 | struct scatterlist req; |
109 | struct scatterlist resp; | 110 | struct scatterlist resp; |
110 | struct fc_els_adisc adisc_req; | 111 | struct fc_els_adisc adisc_req; |