Merge git://www.linux-watchdog.org/linux-watchdog

[pandora-kernel.git] / drivers / scsi / qla4xxx / ql4_iocb.c

diff --git a/drivers/scsi/qla4xxx/ql4_iocb.c b/drivers/scsi/qla4xxx/ql4_iocb.c
index e9def62..4106693 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_iocb.c
+++ b/drivers/scsi/qla4xxx/ql4_iocb.c
@@ -313,10 +313,8 @@ int qla4xxx_send_command_to_isp(struct scsi_qla_host *ha, struct srb * srb)
        cmd_entry->hdr.entryType = ET_COMMAND;
        cmd_entry->handle = cpu_to_le32(index);
        cmd_entry->target = cpu_to_le16(ddb_entry->fw_ddb_index);
-       cmd_entry->connection_id = cpu_to_le16(ddb_entry->connection_id);
 
        int_to_scsilun(cmd->device->lun, &cmd_entry->lun);
-       cmd_entry->cmdSeqNum = cpu_to_le32(ddb_entry->CmdSn);
        cmd_entry->ttlByteCnt = cpu_to_le32(scsi_bufflen(cmd));
        memcpy(cmd_entry->cdb, cmd->cmnd, cmd->cmd_len);
        cmd_entry->dataSegCnt = cpu_to_le16(tot_dsds);
@@ -409,7 +407,7 @@ int qla4xxx_send_passthru0(struct iscsi_task *task)
        passthru_iocb->timeout = cpu_to_le16(PT_DEFAULT_TIMEOUT);
 
        /* Setup the out & in DSDs */
-       if (task->data_count) {
+       if (task_data->req_len) {
                memcpy((uint8_t *)task_data->req_buffer +
                       sizeof(struct iscsi_hdr), task->data, task->data_count);
                ctrl_flags |= PT_FLAG_SEND_BUFFER;