2 files changed, 23 insertions, 2 deletions

diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 47524c726ee8..feff74e544b7 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -43,6 +43,10 @@ enum iscsi_uevent_e {
         ISCSI_UEVENT_GET_STATS          = UEVENT_BASE + 10,
         ISCSI_UEVENT_GET_PARAM          = UEVENT_BASE + 11,
 
+        ISCSI_UEVENT_TRANSPORT_EP_CONNECT       = UEVENT_BASE + 12,
+        ISCSI_UEVENT_TRANSPORT_EP_POLL          = UEVENT_BASE + 13,
+        ISCSI_UEVENT_TRANSPORT_EP_DISCONNECT    = UEVENT_BASE + 14,
+
         /* up events */
         ISCSI_KEVENT_RECV_PDU           = KEVENT_BASE + 1,
         ISCSI_KEVENT_CONN_ERROR         = KEVENT_BASE + 2,
@@ -69,7 +73,7 @@ struct iscsi_uevent {
                 struct msg_bind_conn {
                         uint32_t        sid;
                         uint32_t        cid;
-                        uint32_t        transport_fd;
+                        uint64_t        transport_eph;
                         uint32_t        is_leading;
                 } b_conn;
                 struct msg_destroy_conn {
@@ -102,6 +106,16 @@ struct iscsi_uevent {
                         uint32_t        sid;
                         uint32_t        cid;
                 } get_stats;
+                struct msg_transport_connect {
+                        uint32_t        non_blocking;
+                } ep_connect;
+                struct msg_transport_poll {
+                        uint64_t        ep_handle;
+                        uint32_t        timeout_ms;
+                } ep_poll;
+                struct msg_transport_disconnect {
+                        uint64_t        ep_handle;
+                } ep_disconnect;
         } u;
         union {
                 /* messages k -> u */
@@ -124,6 +138,9 @@ struct iscsi_uevent {
                         uint32_t        cid;
                         uint32_t        error; /* enum iscsi_err */
                 } connerror;
+                struct msg_transport_connect_ret {
+                        uint64_t        handle;
+                } ep_connect_ret;
         } r;
 } __attribute__ ((aligned (sizeof(uint64_t))));
 
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index b332d6e839fe..c9e9475c6dff 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -88,7 +88,7 @@ struct iscsi_transport {
                                 uint32_t cid);
         int (*bind_conn) (struct iscsi_cls_session *session,
                           struct iscsi_cls_conn *cls_conn,
-                          uint32_t transport_fd, int is_leading);
+                          uint64_t transport_eph, int is_leading);
         int (*start_conn) (struct iscsi_cls_conn *conn);
         void (*stop_conn) (struct iscsi_cls_conn *conn, int flag);
         void (*destroy_conn) (struct iscsi_cls_conn *conn);
@@ -119,6 +119,10 @@ struct iscsi_transport {
         int (*xmit_mgmt_task) (struct iscsi_conn *conn,
                                struct iscsi_mgmt_task *mtask);
         void (*session_recovery_timedout) (struct iscsi_cls_session *session);
+        int (*ep_connect) (struct sockaddr *dst_addr, int non_blocking,
+                           uint64_t *ep_handle);
+        int (*ep_poll) (uint64_t ep_handle, int timeout_ms);
+        void (*ep_disconnect) (uint64_t ep_handle);
 };
 
 /*