diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:42:23 -0400 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:42:23 -0400 |
commit | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch) | |
tree | 4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/scsi/qla2xxx/qla_iocb.c | |
parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
parent | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (diff) |
merge by hand (fix up qla_os.c merge error)
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_iocb.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_iocb.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index af964bb3d870..ecaf9f83b2d4 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c | |||
@@ -433,11 +433,8 @@ qla2x00_start_scsi(srb_t *sp) | |||
433 | } else | 433 | } else |
434 | ha->request_ring_ptr++; | 434 | ha->request_ring_ptr++; |
435 | 435 | ||
436 | ha->actthreads++; | ||
437 | ha->total_ios++; | ||
438 | sp->flags |= SRB_DMA_VALID; | 436 | sp->flags |= SRB_DMA_VALID; |
439 | sp->state = SRB_ACTIVE_STATE; | 437 | sp->state = SRB_ACTIVE_STATE; |
440 | sp->u_start = jiffies; | ||
441 | 438 | ||
442 | /* Set chip new ring index. */ | 439 | /* Set chip new ring index. */ |
443 | WRT_REG_WORD(ISP_REQ_Q_IN(ha, reg), ha->req_ring_index); | 440 | WRT_REG_WORD(ISP_REQ_Q_IN(ha, reg), ha->req_ring_index); |