Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target: Convert to DIV_ROUND_UP_SECTOR_T usage for sectors / dev_max_sectors
  kernel.h: Add DIV_ROUND_UP_ULL and DIV_ROUND_UP_SECTOR_T macro usage
  iscsi-target: Add iSCSI fabric support for target v4.1
  iscsi: Add Serial Number Arithmetic LT and GT into iscsi_proto.h
  iscsi: Use struct scsi_lun in iscsi structs instead of u8[8]
  iscsi: Resolve iscsi_proto.h naming conflicts with drivers/target/iscsi

2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c
index 030a96c646c3..9ae80cd5953b 100644
--- a/drivers/scsi/bnx2i/bnx2i_hwi.c
+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
@@ -332,11 +332,11 @@ int bnx2i_send_iscsi_login(struct bnx2i_conn *bnx2i_conn,
 {
         struct bnx2i_cmd *bnx2i_cmd;
         struct bnx2i_login_request *login_wqe;
-        struct iscsi_login *login_hdr;
+        struct iscsi_login_req *login_hdr;
         u32 dword;
 
         bnx2i_cmd = (struct bnx2i_cmd *)task->dd_data;
-        login_hdr = (struct iscsi_login *)task->hdr;
+        login_hdr = (struct iscsi_login_req *)task->hdr;
         login_wqe = (struct bnx2i_login_request *)
                                                 bnx2i_conn->ep->qp.sq_prod_qe;
 
@@ -1349,7 +1349,7 @@ int bnx2i_process_scsi_cmd_resp(struct iscsi_session *session,
         struct bnx2i_cmd_response *resp_cqe;
         struct bnx2i_cmd *bnx2i_cmd;
         struct iscsi_task *task;
-        struct iscsi_cmd_rsp *hdr;
+        struct iscsi_scsi_rsp *hdr;
         u32 datalen = 0;
 
         resp_cqe = (struct bnx2i_cmd_response *)cqe;
@@ -1376,7 +1376,7 @@ int bnx2i_process_scsi_cmd_resp(struct iscsi_session *session,
         }
         bnx2i_iscsi_unmap_sg_list(bnx2i_cmd);
 
-        hdr = (struct iscsi_cmd_rsp *)task->hdr;
+        hdr = (struct iscsi_scsi_rsp *)task->hdr;
         resp_cqe = (struct bnx2i_cmd_response *)cqe;
         hdr->opcode = resp_cqe->op_code;
         hdr->max_cmdsn = cpu_to_be32(resp_cqe->max_cmd_sn);
diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c
index 5c55a75ae597..cffd4d75df56 100644
--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c
+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
@@ -1213,7 +1213,7 @@ static int bnx2i_task_xmit(struct iscsi_task *task)
         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 (atomic_read(&bnx2i_conn->ep->num_active_cmds) + 1  >
             hba->max_sqes)