From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 26 Jul 2011 03:21:35 +0000 (+1000)
Subject: Merge remote-tracking branch 'iscsi-target/for-next'
X-Git-Tag: next-20110726~40
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=535058f7a6fabb252d44c9b6c32af12adbb92fef;p=karo-tx-linux.git

Merge remote-tracking branch 'iscsi-target/for-next'
---

535058f7a6fabb252d44c9b6c32af12adbb92fef
diff --cc drivers/scsi/bnx2i/bnx2i_iscsi.c
index 5c55a75ae597,97ff47ce1840..cffd4d75df56
--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c
+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
@@@ -1213,10 -1212,9 +1213,10 @@@ static int bnx2i_task_xmit(struct iscsi
  	struct bnx2i_conn *bnx2i_conn = conn->dd_data;
  	struct scsi_cmnd *sc = task->sc;
  	struct bnx2i_cmd *cmd = task->dd_data;
- 	struct iscsi_cmd *hdr = (struct iscsi_cmd *) task->hdr;
+ 	struct iscsi_scsi_req *hdr = (struct iscsi_scsi_req *)task->hdr;
  
 -	if (bnx2i_conn->ep->num_active_cmds + 1 > hba->max_sqes)
 +	if (atomic_read(&bnx2i_conn->ep->num_active_cmds) + 1  >
 +	    hba->max_sqes)
  		return -ENOMEM;
  
  	/*