diff options
| author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2008-09-11 21:22:52 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-10-03 11:46:18 -0500 |
| commit | 2d136938792ba04bf3b6bb2d3a2807dc05c396fc (patch) | |
| tree | 58a64c2e78445da6d6af037128df3d5c4409e525 /drivers/scsi/qla2xxx | |
| parent | cc3ef7bc40bbede7bbd0bb395d6452a575e95efe (diff) | |
| download | kernel_samsung_aries-2d136938792ba04bf3b6bb2d3a2807dc05c396fc.zip kernel_samsung_aries-2d136938792ba04bf3b6bb2d3a2807dc05c396fc.tar.gz kernel_samsung_aries-2d136938792ba04bf3b6bb2d3a2807dc05c396fc.tar.bz2 | |
[SCSI] qla2xxx: Additional residual-count corrections during UNDERRUN handling.
Add additional tightening of residual-count handling (originally
from commit 6acf8190025e9c4ea513d4084ff089d476112816) where the
driver should discard any lower SCSI-status during
firmware/transport residual-count mismatches.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/qla2xxx')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_isr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 92cab5c..9eb6ef3 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -1060,8 +1060,9 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt) resid = resid_len; /* Use F/W calculated residual length. */ if (IS_FWI2_CAPABLE(ha)) { - if (scsi_status & SS_RESIDUAL_UNDER && - resid != fw_resid_len) { + if (!(scsi_status & SS_RESIDUAL_UNDER)) { + lscsi_status = 0; + } else if (resid != fw_resid_len) { scsi_status &= ~SS_RESIDUAL_UNDER; lscsi_status = 0; } |