diff options
| author | Chad Dupuis <chad.dupuis@qlogic.com> | 2013-02-08 07:57:46 +0100 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-02-22 13:24:42 +0100 |
| commit | 1bcc46cb74d3ba7471eac57af8931ca1a03e7b36 (patch) | |
| tree | 52439be1bf861588368e690058754cc2bee170fb | |
| parent | [SCSI] qla2xxx: Print thermal unsupported message. (diff) | |
| download | linux-1bcc46cb74d3ba7471eac57af8931ca1a03e7b36.tar.xz linux-1bcc46cb74d3ba7471eac57af8931ca1a03e7b36.zip | |
[SCSI] qla2xxx: Reject loopback request if one is already in progress.
If another function on the port has initiated a loopback operation do not
process the current request.
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_bsg.c | 8 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_dbg.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c index f7cb6a3fa7d4..5b49766e0ae7 100644 --- a/drivers/scsi/qla2xxx/qla_bsg.c +++ b/drivers/scsi/qla2xxx/qla_bsg.c @@ -746,6 +746,14 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job) goto done_free_dma_rsp; } + if ((config[0] & INTERNAL_LOOPBACK_MASK) != 0) { + ql_dbg(ql_dbg_user, vha, 0x70c4, + "Loopback operation already in " + "progress.\n"); + rval = -EAGAIN; + goto done_free_dma_rsp; + } + ql_dbg(ql_dbg_user, vha, 0x70c0, "elreq.options=%04x\n", elreq.options); diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index af045ed0a230..c1d2310c615e 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c @@ -24,7 +24,7 @@ * | Async Events | 0x5071 | 0x502b-0x502f | * | | | 0x5047,0x5052 | * | Timer Routines | 0x6011 | | - * | User Space Interactions | 0x70c3 | 0x7018,0x702e, | + * | User Space Interactions | 0x70c4 | 0x7018,0x702e, | * | | | 0x7020,0x7024, | * | | | 0x7039,0x7045, | * | | | 0x7073-0x7075, | |