2 files changed, 33 insertions, 0 deletions

diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 7ff9678b7e79..228a8af05129 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -61,6 +61,8 @@ enum iscsi_uevent_e {
         ISCSI_UEVENT_PATH_UPDATE        = UEVENT_BASE + 20,
         ISCSI_UEVENT_SET_IFACE_PARAMS   = UEVENT_BASE + 21,
         ISCSI_UEVENT_PING               = UEVENT_BASE + 22,
+        ISCSI_UEVENT_GET_CHAP           = UEVENT_BASE + 23,
+        ISCSI_UEVENT_DELETE_CHAP        = UEVENT_BASE + 24,
 
         /* up events */
         ISCSI_KEVENT_RECV_PDU           = KEVENT_BASE + 1,
@@ -196,6 +198,18 @@ struct iscsi_uevent {
                         uint32_t        pid;    /* unique ping id associated
                                                    with each ping request */
                 } iscsi_ping;
+                struct msg_get_chap {
+                        uint32_t        host_no;
+                        uint32_t        num_entries; /* number of CHAP entries
+                                                      * on request, number of
+                                                      * valid CHAP entries on
+                                                      * response */
+                        uint16_t        chap_tbl_idx;
+                } get_chap;
+                struct msg_delete_chap {
+                       uint32_t        host_no;
+                       uint16_t        chap_tbl_idx;
+                } delete_chap;
         } u;
         union {
                 /* messages k -> u */
@@ -548,4 +562,19 @@ struct iscsi_stats {
                 __attribute__ ((aligned (sizeof(uint64_t))));
 };
 
+enum chap_type_e {
+        CHAP_TYPE_OUT,
+        CHAP_TYPE_IN,
+};
+
+#define ISCSI_CHAP_AUTH_NAME_MAX_LEN    256
+#define ISCSI_CHAP_AUTH_SECRET_MAX_LEN  256
+struct iscsi_chap_rec {
+        uint16_t chap_tbl_idx;
+        enum chap_type_e chap_type;
+        char username[ISCSI_CHAP_AUTH_NAME_MAX_LEN];
+        uint8_t password[ISCSI_CHAP_AUTH_SECRET_MAX_LEN];
+        uint8_t password_length;
+} __packed;
+
 #endif
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index aede513f99bd..53f0b361d668 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -147,6 +147,9 @@ struct iscsi_transport {
         int (*send_ping) (struct Scsi_Host *shost, uint32_t iface_num,
                           uint32_t iface_type, uint32_t payload_size,
                           uint32_t pid, struct sockaddr *dst_addr);
+        int (*get_chap) (struct Scsi_Host *shost, uint16_t chap_tbl_idx,
+                         uint32_t *num_entries, char *buf);
+        int (*delete_chap) (struct Scsi_Host *shost, uint16_t chap_tbl_idx);
 };
 
 /*
@@ -325,5 +328,6 @@ extern void iscsi_destroy_iface(struct iscsi_iface *iface);
 extern struct iscsi_iface *iscsi_lookup_iface(int handle);
 extern char *iscsi_get_port_speed_name(struct Scsi_Host *shost);
 extern char *iscsi_get_port_state_name(struct Scsi_Host *shost);
+extern int iscsi_is_session_dev(const struct device *dev);
 
 #endif