aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libiscsi.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-05-12 19:20:04 -0400
committerThomas Gleixner <tglx@linutronix.de>2010-05-12 19:20:04 -0400
commit1540c84b5ed657ed71dce06915bba461e6b09574 (patch)
treea449dc166800a1b0c429bb038bfc974e577eaf72 /drivers/scsi/libiscsi.c
parent1a3a403aa98b0ccabeb12abd7da90d33250ea36b (diff)
parent4640b4e7d9919e9629fe8456df94f71658431ef9 (diff)
Merge branch '2.6.33.4' into rt/2.6.33
Conflicts: Makefile Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/scsi/libiscsi.c')
-rw-r--r--drivers/scsi/libiscsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index e6b67f2d3229..741672f36688 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -470,12 +470,12 @@ static int iscsi_prep_scsi_cmd_pdu(struct iscsi_task *task)
470 470
471 WARN_ON(hdrlength >= 256); 471 WARN_ON(hdrlength >= 256);
472 hdr->hlength = hdrlength & 0xFF; 472 hdr->hlength = hdrlength & 0xFF;
473 hdr->cmdsn = task->cmdsn = cpu_to_be32(session->cmdsn);
473 474
474 if (session->tt->init_task && session->tt->init_task(task)) 475 if (session->tt->init_task && session->tt->init_task(task))
475 return -EIO; 476 return -EIO;
476 477
477 task->state = ISCSI_TASK_RUNNING; 478 task->state = ISCSI_TASK_RUNNING;
478 hdr->cmdsn = task->cmdsn = cpu_to_be32(session->cmdsn);
479 session->cmdsn++; 479 session->cmdsn++;
480 480
481 conn->scsicmd_pdus_cnt++; 481 conn->scsicmd_pdus_cnt++;