2 files changed, 5 insertions, 6 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index d692c713416a..cbe0a17ced5f 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -5,6 +5,7 @@
  * See LICENSE.qla4xxx for copyright and licensing details.
  */
 
+#include <scsi/iscsi_if.h>
 #include "ql4_def.h"
 #include "ql4_glbl.h"
 #include "ql4_dbg.h"
@@ -1305,7 +1306,8 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha,
                 atomic_set(&ddb_entry->relogin_timer, 0);
                 clear_bit(DF_RELOGIN, &ddb_entry->flags);
                 clear_bit(DF_NO_RELOGIN, &ddb_entry->flags);
-                iscsi_if_create_session_done(ddb_entry->conn);
+                iscsi_session_event(ddb_entry->sess,
+                                    ISCSI_KEVENT_CREATE_SESSION);
                 /*
                  * Change the lun state to READY in case the lun TIMEOUT before
                  * the device came back.
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 89460d27c689..f55b9f7d9396 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -298,8 +298,7 @@ void qla4xxx_destroy_sess(struct ddb_entry *ddb_entry)
                 return;
 
         if (ddb_entry->conn) {
-                iscsi_if_destroy_session_done(ddb_entry->conn);
-                iscsi_destroy_conn(ddb_entry->conn);
+                atomic_set(&ddb_entry->state, DDB_STATE_DEAD);
                 iscsi_remove_session(ddb_entry->sess);
         }
         iscsi_free_session(ddb_entry->sess);
@@ -309,6 +308,7 @@ int qla4xxx_add_sess(struct ddb_entry *ddb_entry)
 {
         int err;
 
+        ddb_entry->sess->recovery_tmo = ddb_entry->ha->port_down_retry_count;
         err = iscsi_add_session(ddb_entry->sess, ddb_entry->fw_ddb_index);
         if (err) {
                 DEBUG2(printk(KERN_ERR "Could not add session.\n"));
@@ -321,9 +321,6 @@ int qla4xxx_add_sess(struct ddb_entry *ddb_entry)
                 DEBUG2(printk(KERN_ERR "Could not add connection.\n"));
                 return -ENOMEM;
         }
-
-        ddb_entry->sess->recovery_tmo = ddb_entry->ha->port_down_retry_count;
-        iscsi_if_create_session_done(ddb_entry->conn);
         return 0;
 }