2 files changed, 19 insertions, 0 deletions

diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 8a4426df6c3a..e19e58423166 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -244,6 +244,12 @@ enum iscsi_param {
         ISCSI_PARAM_PASSWORD_IN,
 
         ISCSI_PARAM_FAST_ABORT,
+        ISCSI_PARAM_ABORT_TMO,
+        ISCSI_PARAM_LU_RESET_TMO,
+        ISCSI_PARAM_HOST_RESET_TMO,
+
+        ISCSI_PARAM_PING_TMO,
+        ISCSI_PARAM_RECV_TMO,
         /* must always be last */
         ISCSI_PARAM_MAX,
 };
@@ -275,6 +281,11 @@ enum iscsi_param {
 #define ISCSI_PASSWORD                  (1 << ISCSI_PARAM_PASSWORD)
 #define ISCSI_PASSWORD_IN               (1 << ISCSI_PARAM_PASSWORD_IN)
 #define ISCSI_FAST_ABORT                (1 << ISCSI_PARAM_FAST_ABORT)
+#define ISCSI_ABORT_TMO                 (1 << ISCSI_PARAM_ABORT_TMO)
+#define ISCSI_LU_RESET_TMO              (1 << ISCSI_PARAM_LU_RESET_TMO)
+#define ISCSI_HOST_RESET_TMO            (1 << ISCSI_PARAM_HOST_RESET_TMO)
+#define ISCSI_PING_TMO                  (1 << ISCSI_PARAM_PING_TMO)
+#define ISCSI_RECV_TMO                  (1 << ISCSI_PARAM_RECV_TMO)
 
 /* iSCSI HBA params */
 enum iscsi_host_param {
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 {
          * conn_stop() flag: stop to recover, stop to terminate
          */
         int                     stop_stage;
+        struct timer_list       transport_timer;
+        unsigned long           last_recv;
+        unsigned long           last_ping;
+        int                     ping_timeout;
+        int                     recv_timeout;
+        struct iscsi_mgmt_task  *ping_mtask;
 
         /* iSCSI connection-wide sequencing */
         uint32_t                exp_statsn;
@@ -238,6 +244,8 @@ struct iscsi_session {
         uint32_t                queued_cmdsn;
 
         /* configuration */
+        int                     abort_timeout;
+        int                     lu_reset_timeout;
         int                     initial_r2t_en;
         unsigned                max_r2t;
         int                     imm_data_en;