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>
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user