diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.c | 9 | ||||
-rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.h | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index 2e65168d8723..88f3a83dbd2e 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c | |||
@@ -4187,15 +4187,6 @@ lpfc_queuecommand_lck(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *)) | |||
4187 | cmnd->result = err; | 4187 | cmnd->result = err; |
4188 | goto out_fail_command; | 4188 | goto out_fail_command; |
4189 | } | 4189 | } |
4190 | /* | ||
4191 | * Do not let the mid-layer retry I/O too fast. If an I/O is retried | ||
4192 | * without waiting a bit then indicate that the device is busy. | ||
4193 | */ | ||
4194 | if (cmnd->retries && | ||
4195 | time_before(jiffies, (cmnd->jiffies_at_alloc + | ||
4196 | msecs_to_jiffies(LPFC_RETRY_PAUSE * | ||
4197 | cmnd->retries)))) | ||
4198 | return SCSI_MLQUEUE_DEVICE_BUSY; | ||
4199 | ndlp = rdata->pnode; | 4190 | ndlp = rdata->pnode; |
4200 | 4191 | ||
4201 | if ((scsi_get_prot_op(cmnd) != SCSI_PROT_NORMAL) && | 4192 | if ((scsi_get_prot_op(cmnd) != SCSI_PROT_NORMAL) && |
diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h index e2e33043033e..21a2ffe67eac 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.h +++ b/drivers/scsi/lpfc/lpfc_scsi.h | |||
@@ -164,5 +164,4 @@ struct lpfc_scsi_buf { | |||
164 | 164 | ||
165 | #define LPFC_SCSI_DMA_EXT_SIZE 264 | 165 | #define LPFC_SCSI_DMA_EXT_SIZE 264 |
166 | #define LPFC_BPL_SIZE 1024 | 166 | #define LPFC_BPL_SIZE 1024 |
167 | #define LPFC_RETRY_PAUSE 300 | ||
168 | #define MDAC_DIRECT_CMD 0x22 | 167 | #define MDAC_DIRECT_CMD 0x22 |