iscsi: Resolve iscsi_proto.h naming conflicts with drivers/target/iscsi

[mv-sheeva.git] / drivers / scsi / bnx2i / bnx2i_hwi.c

diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c
index 372d30c099cce3792c6d940191301bf6423065d5..1b160e12afa3ee46af744c96f6fbd8cd6c22c264 100644 (file)
--- a/drivers/scsi/bnx2i/bnx2i_hwi.c
+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
@@ -328,11 +328,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;
 
@@ -1344,7 +1344,7 @@ static 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;
@@ -1371,7 +1371,7 @@ static 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);