From 69792a61d3bf4835cbd28f6d1ba5df0846c0b0e8 Mon Sep 17 00:00:00 2001 From: Eddie Wai Date: Mon, 16 May 2011 11:13:18 -0700 Subject: [PATCH] --- yaml --- r: 252443 b: refs/heads/master c: 7287c63e986fe1a51a89f4bb1327320274a7a741 h: refs/heads/master i: 252441: 902d4ceb0e5ed62e00e8feeaa6360cadeb25ded1 252439: dc56081763fcd8c46c847fe0d256e0a7acee8a60 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/bnx2i/bnx2i_hwi.c | 1 + trunk/drivers/scsi/bnx2i/bnx2i_iscsi.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 877fc968122e..bb85c78e54c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b278656f26707d410778d42cd6f789b5c53c41b +refs/heads/master: 7287c63e986fe1a51a89f4bb1327320274a7a741 diff --git a/trunk/drivers/scsi/bnx2i/bnx2i_hwi.c b/trunk/drivers/scsi/bnx2i/bnx2i_hwi.c index f0b89513faed..a8a2b6b65a3c 100644 --- a/trunk/drivers/scsi/bnx2i/bnx2i_hwi.c +++ b/trunk/drivers/scsi/bnx2i/bnx2i_hwi.c @@ -1274,6 +1274,7 @@ int bnx2i_send_fw_iscsi_init_msg(struct bnx2i_hba *hba) iscsi_init.dummy_buffer_addr_hi = (u32) ((u64) hba->dummy_buf_dma >> 32); + hba->num_ccell = hba->max_sqes >> 1; hba->ctx_ccell_tasks = ((hba->num_ccell & 0xFFFF) | (hba->max_sqes << 16)); iscsi_init.num_ccells_per_conn = hba->num_ccell; diff --git a/trunk/drivers/scsi/bnx2i/bnx2i_iscsi.c b/trunk/drivers/scsi/bnx2i/bnx2i_iscsi.c index 1809f9ccc4ce..7b4d1d041e2e 100644 --- a/trunk/drivers/scsi/bnx2i/bnx2i_iscsi.c +++ b/trunk/drivers/scsi/bnx2i/bnx2i_iscsi.c @@ -1208,6 +1208,9 @@ 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->ep->num_active_cmds + 1 > hba->max_sqes) + return -ENOMEM; + /* * If there is no scsi_cmnd this must be a mgmt task */