diff options
| author | mav <mav@FreeBSD.org> | 2015-10-05 08:35:48 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-10-05 08:35:48 +0000 |
| commit | 344c89f147e19b59af7455b8b31e55aa298815e4 (patch) | |
| tree | 791ce5dec3504c31ac71c9208a35beaf0a1f1e98 | |
| parent | 66cf55baf8a34e47e934c4a1a9426e995d89626b (diff) | |
| download | FreeBSD-src-344c89f147e19b59af7455b8b31e55aa298815e4.zip FreeBSD-src-344c89f147e19b59af7455b8b31e55aa298815e4.tar.gz | |
MFC r285600: MULTI_ID supported does not mean it is used.
| -rw-r--r-- | sys/dev/isp/isp.c | 2 | ||||
| -rw-r--r-- | sys/dev/isp/isp_freebsd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index aaab1c3..9e8e29b 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -3653,7 +3653,7 @@ isp_scan_fabric(ispsoftc_t *isp, int chan) * that have the same domain and area code as our own * portid. */ - if (ISP_CAP_MULTI_ID(isp)) { + if (ISP_CAP_MULTI_ID(isp) && isp->isp_nchan > 1) { if ((portid >> 8) == (fcp->isp_portid >> 8)) { isp_prt(isp, ISP_LOG_SANCFG, "Chan %d skip PortID 0x%06x", diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index 1aef6fb..1ff64e1 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -2533,7 +2533,7 @@ isp_handle_platform_atio7(ispsoftc_t *isp, at7_entry_t *aep) * If we can't, we're somewhat in trouble because we can't actually respond w/o that information. * We also, as a matter of course, need to know the WWN of the initiator too. */ - if (ISP_CAP_MULTI_ID(isp)) { + if (ISP_CAP_MULTI_ID(isp) && isp->isp_nchan > 1) { /* * Find the right channel based upon D_ID */ |
