Author: mav
Date: Mon Oct 5 08:35:48 2015
New Revision: 288717
URL: https://svnweb.freebsd.org/changeset/base/288717
Log:
MFC r285600: MULTI_ID supported does not mean it is used.
Modified:
stable/10/sys/dev/isp/isp.c
stable/10/sys/dev/isp/isp_freebsd.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/isp/isp.c
==============================================================================
--- stable/10/sys/dev/isp/isp.c Mon Oct 5 08:33:41 2015 (r288716)
+++ stable/10/sys/dev/isp/isp.c Mon Oct 5 08:35:48 2015 (r288717)
@@ -3653,7 +3653,7 @@ isp_scan_fabric(ispsoftc_t *isp, int cha
* 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",
Modified: stable/10/sys/dev/isp/isp_freebsd.c
==============================================================================
--- stable/10/sys/dev/isp/isp_freebsd.c Mon Oct 5 08:33:41 2015
(r288716)
+++ stable/10/sys/dev/isp/isp_freebsd.c Mon Oct 5 08:35:48 2015
(r288717)
@@ -2533,7 +2533,7 @@ isp_handle_platform_atio7(ispsoftc_t *is
* 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
*/
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
