diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2019-04-13 03:27:23 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2019-04-13 03:27:23 +0200 |
| commit | 17631462cd49f3dfa9db38a9e578c59f71ccf414 (patch) | |
| tree | 0e44caf23bacf31cea3b414132db94ba92bd7e34 /drivers/scsi/qla2xxx/qla_init.c | |
| parent | scsi: target/iscsi: Make sure PDU processing continues if parsing a command f... (diff) | |
| parent | scsi: csiostor: fix missing data copy in csio_scsi_err_handler() (diff) | |
| download | linux-17631462cd49f3dfa9db38a9e578c59f71ccf414.tar.xz linux-17631462cd49f3dfa9db38a9e578c59f71ccf414.zip | |
Merge branch '5.1/scsi-fixes' into 5.2/merge
We have a few submissions for 5.2 that depend on fixes merged post
5.1-rc1. Merge the fixes branch into queue.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_init.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 9a8e54832e9f..557a80fc7248 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -5072,6 +5072,13 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha) if ((domain & 0xf0) == 0xf0) continue; + /* Bypass if not same domain and area of adapter. */ + if (area && domain && ((area != vha->d_id.b.area) || + (domain != vha->d_id.b.domain)) && + (ha->current_topology == ISP_CFG_NL)) + continue; + + /* Bypass invalid local loop ID. */ if (loop_id > LAST_LOCAL_LOOP_ID) continue; |