1 files changed, 2 insertions, 8 deletions

diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c
index cafb888c2376..070118a8f184 100644
--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c
+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
@@ -1161,9 +1161,6 @@ static int bnx2i_task_xmit(struct iscsi_task *task)
         struct bnx2i_cmd *cmd = task->dd_data;
         struct iscsi_cmd *hdr = (struct iscsi_cmd *) task->hdr;
 
-        if (!bnx2i_conn->is_bound)
-                return -ENOTCONN;
-
         /*
          * If there is no scsi_cmnd this must be a mgmt task
          */
@@ -1371,7 +1368,6 @@ static int bnx2i_conn_bind(struct iscsi_cls_session *cls_session,
         bnx2i_conn->ep = bnx2i_ep;
         bnx2i_conn->iscsi_conn_cid = bnx2i_ep->ep_iscsi_cid;
         bnx2i_conn->fw_cid = bnx2i_ep->ep_cid;
-        bnx2i_conn->is_bound = 1;
 
         ret_code = bnx2i_bind_conn_to_iscsi_cid(hba, bnx2i_conn,
                                                 bnx2i_ep->ep_iscsi_cid);
@@ -1896,9 +1892,7 @@ static void bnx2i_ep_disconnect(struct iscsi_endpoint *ep)
                 conn = bnx2i_conn->cls_conn->dd_data;
                 session = conn->session;
 
-                spin_lock_bh(&session->lock);
-                bnx2i_conn->is_bound = 0;
-                spin_unlock_bh(&session->lock);
+                iscsi_suspend_queue(conn);
         }
 
         hba = bnx2i_ep->hba;
@@ -2034,7 +2028,7 @@ struct iscsi_transport bnx2i_iscsi_transport = {
                                   ISCSI_USERNAME | ISCSI_PASSWORD |
                                   ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN |
                                   ISCSI_FAST_ABORT | ISCSI_ABORT_TMO |
-                                  ISCSI_LU_RESET_TMO |
+                                  ISCSI_LU_RESET_TMO | ISCSI_TGT_RESET_TMO |
                                   ISCSI_PING_TMO | ISCSI_RECV_TMO |
                                   ISCSI_IFACE_NAME | ISCSI_INITIATOR_NAME,
         .host_param_mask        = ISCSI_HOST_HWADDRESS | ISCSI_HOST_NETDEV_NAME,