Home Home > GIT Browse > SLE11-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-06-08 15:35:41 +0200
committerJiri Kosina <jkosina@suse.cz>2018-06-08 15:35:41 +0200
commiteb71908d5e8e4ad32fa642fd33b4417f01034245 (patch)
tree192b6311dd811058a550f0b4c8902b556984ec4f
parent649255e04b6f3965bc83988fb8a55c0149c3a1df (diff)
parent60e8fd3467d34d105ce7a57410d8c0f451f0ecfa (diff)
Merge remote-tracking branch 'origin/users/mwilck/SLE11-SP4/for-next' into SLE11-SP4
Pull qla2xxx fix from Martin Wilck suse-commit: 7d84829bbefd43456a9399f89ca1eaa23c92effa
-rw-r--r--drivers/scsi/qla2xxx/qla_isr.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 736aea2eb5da..578816a19c04 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2120,8 +2120,12 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
ox_id = le16_to_cpu(sts24->ox_id);
par_sense_len = sizeof(sts24->data);
/* Valid values of the retry delay timer are 0x1-0xffef */
- if (sts24->retry_delay > 0 && sts24->retry_delay < 0xfff1)
- retry_delay = sts24->retry_delay;
+ if (sts24->retry_delay > 0 && sts24->retry_delay < 0xfff1) {
+ retry_delay = sts24->retry_delay & 0x3fff;
+ ql_dbg(ql_dbg_io, vha, 0x3033,
+ "%s: scope=%#x retry_delay=%#x\n", __func__,
+ sts24->retry_delay >> 14, retry_delay);
+ }
} else {
if (scsi_status & SS_SENSE_LEN_VALID)
sense_len = le16_to_cpu(sts->req_sense_length);