1 files changed, 5 insertions, 8 deletions

diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index ae5196aae1a5..0f4367751b71 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -89,6 +89,7 @@ enum {
         ISCSI_TASK_RUNNING,
         ISCSI_TASK_ABRT_TMF,            /* aborted due to TMF */
         ISCSI_TASK_ABRT_SESS_RECOV,     /* aborted due to session recovery */
+        ISCSI_TASK_REQUEUE_SCSIQ,       /* qcmd requeueing to scsi-ml */
 };
 
 struct iscsi_r2t_info {
@@ -211,9 +212,6 @@ struct iscsi_conn {
         /* values userspace uses to id a conn */
         int                     persistent_port;
         char                    *persistent_address;
-        /* remote portal currently connected to */
-        int                     portal_port;
-        char                    portal_address[ISCSI_ADDRESS_BUF_LEN];
 
         /* MIB-statistics */
         uint64_t                txdata_octets;
@@ -318,9 +316,6 @@ struct iscsi_host {
         /* hw address or netdev iscsi connection is bound to */
         char                    *hwaddress;
         char                    *netdev;
-        /* local address */
-        int                     local_port;
-        char                    local_address[ISCSI_ADDRESS_BUF_LEN];
 
         wait_queue_head_t       session_removal_wq;
         /* protects sessions and state */
@@ -341,8 +336,7 @@ extern int iscsi_eh_abort(struct scsi_cmnd *sc);
 extern int iscsi_eh_recover_target(struct scsi_cmnd *sc);
 extern int iscsi_eh_session_reset(struct scsi_cmnd *sc);
 extern int iscsi_eh_device_reset(struct scsi_cmnd *sc);
-extern int iscsi_queuecommand(struct scsi_cmnd *sc,
-                              void (*done)(struct scsi_cmnd *));
+extern int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc);
 
 /*
  * iSCSI host helpers.
@@ -394,6 +388,8 @@ extern void iscsi_session_failure(struct iscsi_session *session,
                                   enum iscsi_err err);
 extern int iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn,
                                 enum iscsi_param param, char *buf);
+extern int iscsi_conn_get_addr_param(struct sockaddr_storage *addr,
+                                     enum iscsi_param param, char *buf);
 extern void iscsi_suspend_tx(struct iscsi_conn *conn);
 extern void iscsi_suspend_queue(struct iscsi_conn *conn);
 extern void iscsi_conn_queue_work(struct iscsi_conn *conn);
@@ -420,6 +416,7 @@ extern struct iscsi_task *iscsi_itt_to_ctask(struct iscsi_conn *, itt_t);
 extern struct iscsi_task *iscsi_itt_to_task(struct iscsi_conn *, itt_t);
 extern void iscsi_requeue_task(struct iscsi_task *task);
 extern void iscsi_put_task(struct iscsi_task *task);
+extern void __iscsi_put_task(struct iscsi_task *task);
 extern void __iscsi_get_task(struct iscsi_task *task);
 extern void iscsi_complete_scsi_task(struct iscsi_task *task,
                                      uint32_t exp_cmdsn, uint32_t max_cmdsn);