Home Home > GIT Browse > SLE12-SP3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-06-17 20:04:35 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-17 20:04:35 +0200
commitc31f458e82d127c08ea5aefe00b090eb21aed9a3 (patch)
treea97de0d6166c7d7c441c19b0ef16befa2f57ae6e
parent72cced0e69b90f7a096a53e0da102e380a2fa377 (diff)
parent65a31eebdec90ab78f40dbba7a1dd5d12dc400ba (diff)
Merge branch 'users/hare/SLE12-SP3/for-next' into SLE12-SP3SLE12-SP3
Pull scsi fixes from Hannes Reinecke (bsc#1094555) suse-commit: dd09db47d51f687576ab4af16a6b246afea1ba54
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 2bb362e1a256..4b838729ce07 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -4988,10 +4988,12 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha)
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))
+ 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;