Merge branch 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux...

[pandora-kernel.git] / include / scsi / scsi_transport_iscsi.h

diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index 4a3edee..5994bcc 100644 (file)
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -137,7 +137,8 @@ struct iscsi_transport {
        int (*tgt_dscvr) (struct Scsi_Host *shost, enum iscsi_tgt_dscvr type,
                          uint32_t enable, struct sockaddr *dst_addr);
        int (*set_path) (struct Scsi_Host *shost, struct iscsi_path *params);
-       int (*set_iface_param) (struct Scsi_Host *shost, char *data, int count);
+       int (*set_iface_param) (struct Scsi_Host *shost, void *data,
+                               uint32_t len);
        int (*get_iface_param) (struct iscsi_iface *iface,
                                enum iscsi_param_type param_type,
                                int param, char *buf);
@@ -156,6 +157,8 @@ extern int iscsi_unregister_transport(struct iscsi_transport *tt);
  */
 extern void iscsi_conn_error_event(struct iscsi_cls_conn *conn,
                                   enum iscsi_err error);
+extern void iscsi_conn_login_event(struct iscsi_cls_conn *conn,
+                                  enum iscsi_conn_state state);
 extern int iscsi_recv_pdu(struct iscsi_cls_conn *conn, struct iscsi_hdr *hdr,
                          char *data, uint32_t data_size);
 
@@ -206,6 +209,7 @@ struct iscsi_cls_session {
        struct delayed_work recovery_work;
 
        unsigned int target_id;
+       bool ida_used;
 
        int state;
        int sid;                                /* session id */
@@ -268,6 +272,7 @@ struct iscsi_iface {
        dev_printk(prefix, &(_cls_conn)->dev, fmt, ##a)
 
 extern int iscsi_session_chkready(struct iscsi_cls_session *session);
+extern int iscsi_is_session_online(struct iscsi_cls_session *session);
 extern struct iscsi_cls_session *iscsi_alloc_session(struct Scsi_Host *shost,
                                struct iscsi_transport *transport, int dd_size);
 extern int iscsi_add_session(struct iscsi_cls_session *session,