diff options
Diffstat (limited to 'include/scsi')
-rw-r--r-- | include/scsi/libiscsi.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h index 61e069206ac5..348265d4a27e 100644 --- a/include/scsi/libiscsi.h +++ b/include/scsi/libiscsi.h | |||
@@ -80,7 +80,7 @@ struct iscsi_mgmt_task { | |||
80 | */ | 80 | */ |
81 | struct iscsi_hdr *hdr; | 81 | struct iscsi_hdr *hdr; |
82 | char *data; /* mgmt payload */ | 82 | char *data; /* mgmt payload */ |
83 | int data_count; /* counts data to be sent */ | 83 | unsigned data_count; /* counts data to be sent */ |
84 | uint32_t itt; /* this ITT */ | 84 | uint32_t itt; /* this ITT */ |
85 | void *dd_data; /* driver/transport data */ | 85 | void *dd_data; /* driver/transport data */ |
86 | struct list_head running; | 86 | struct list_head running; |
@@ -101,13 +101,12 @@ struct iscsi_cmd_task { | |||
101 | int itt; /* this ITT */ | 101 | int itt; /* this ITT */ |
102 | 102 | ||
103 | uint32_t unsol_datasn; | 103 | uint32_t unsol_datasn; |
104 | int imm_count; /* imm-data (bytes) */ | 104 | unsigned imm_count; /* imm-data (bytes) */ |
105 | int unsol_count; /* unsolicited (bytes)*/ | 105 | unsigned unsol_count; /* unsolicited (bytes)*/ |
106 | /* offset in unsolicited stream (bytes); */ | 106 | /* offset in unsolicited stream (bytes); */ |
107 | int unsol_offset; | 107 | unsigned unsol_offset; |
108 | int data_count; /* remaining Data-Out */ | 108 | unsigned data_count; /* remaining Data-Out */ |
109 | struct scsi_cmnd *sc; /* associated SCSI cmd*/ | 109 | struct scsi_cmnd *sc; /* associated SCSI cmd*/ |
110 | int total_length; | ||
111 | struct iscsi_conn *conn; /* used connection */ | 110 | struct iscsi_conn *conn; /* used connection */ |
112 | struct iscsi_mgmt_task *mtask; /* tmf mtask in progr */ | 111 | struct iscsi_mgmt_task *mtask; /* tmf mtask in progr */ |
113 | 112 | ||
@@ -173,8 +172,8 @@ struct iscsi_conn { | |||
173 | int tmabort_state; /* see TMABORT_INITIAL, etc.*/ | 172 | int tmabort_state; /* see TMABORT_INITIAL, etc.*/ |
174 | 173 | ||
175 | /* negotiated params */ | 174 | /* negotiated params */ |
176 | int max_recv_dlength; /* initiator_max_recv_dsl*/ | 175 | unsigned max_recv_dlength; /* initiator_max_recv_dsl*/ |
177 | int max_xmit_dlength; /* target_max_recv_dsl */ | 176 | unsigned max_xmit_dlength; /* target_max_recv_dsl */ |
178 | int hdrdgst_en; | 177 | int hdrdgst_en; |
179 | int datadgst_en; | 178 | int datadgst_en; |
180 | int ifmarker_en; | 179 | int ifmarker_en; |
@@ -212,10 +211,10 @@ struct iscsi_session { | |||
212 | 211 | ||
213 | /* configuration */ | 212 | /* configuration */ |
214 | int initial_r2t_en; | 213 | int initial_r2t_en; |
215 | int max_r2t; | 214 | unsigned max_r2t; |
216 | int imm_data_en; | 215 | int imm_data_en; |
217 | int first_burst; | 216 | unsigned first_burst; |
218 | int max_burst; | 217 | unsigned max_burst; |
219 | int time2wait; | 218 | int time2wait; |
220 | int time2retain; | 219 | int time2retain; |
221 | int pdu_inorder_en; | 220 | int pdu_inorder_en; |