aboutsummaryrefslogtreecommitdiffstats
path: root/include/scsi/libiscsi.h
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2007-12-13 13:43:30 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-01-11 19:28:35 -0500
commitf6d5180c78780d63b0577edeb3ce41eeb3e93eea (patch)
tree95eb44fb84dd7659f816c5f1166c1ae7e2301f5f /include/scsi/libiscsi.h
parent2697478903d0ad8bdbf868b1346ae4b891662bb1 (diff)
[SCSI] libiscsi: fix nop handling
During root boot and shutdown the target could send us nops. At this time iscsid cannot be running, so the target will drop the session and the boot or shutdown will hang. To handle this and allow us to better control when to check the network this patch moves the nop handling to the kernel. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'include/scsi/libiscsi.h')
-rw-r--r--include/scsi/libiscsi.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index d68f74523f2e..889f51fabab9 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -148,6 +148,12 @@ struct iscsi_conn {
148 * conn_stop() flag: stop to recover, stop to terminate 148 * conn_stop() flag: stop to recover, stop to terminate
149 */ 149 */
150 int stop_stage; 150 int stop_stage;
151 struct timer_list transport_timer;
152 unsigned long last_recv;
153 unsigned long last_ping;
154 int ping_timeout;
155 int recv_timeout;
156 struct iscsi_mgmt_task *ping_mtask;
151 157
152 /* iSCSI connection-wide sequencing */ 158 /* iSCSI connection-wide sequencing */
153 uint32_t exp_statsn; 159 uint32_t exp_statsn;
@@ -238,6 +244,8 @@ struct iscsi_session {
238 uint32_t queued_cmdsn; 244 uint32_t queued_cmdsn;
239 245
240 /* configuration */ 246 /* configuration */
247 int abort_timeout;
248 int lu_reset_timeout;
241 int initial_r2t_en; 249 int initial_r2t_en;
242 unsigned max_r2t; 250 unsigned max_r2t;
243 int imm_data_en; 251 int imm_data_en;