Author: mav
Date: Wed Jul 15 12:04:12 2015
New Revision: 285600
URL: https://svnweb.freebsd.org/changeset/base/285600

Log:
  MULTI_ID supported does not mean it is used.

Modified:
  head/sys/dev/isp/isp.c
  head/sys/dev/isp/isp_freebsd.c

Modified: head/sys/dev/isp/isp.c
==============================================================================
--- head/sys/dev/isp/isp.c      Wed Jul 15 11:58:30 2015        (r285599)
+++ head/sys/dev/isp/isp.c      Wed Jul 15 12:04:12 2015        (r285600)
@@ -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: head/sys/dev/isp/isp_freebsd.c
==============================================================================
--- head/sys/dev/isp/isp_freebsd.c      Wed Jul 15 11:58:30 2015        
(r285599)
+++ head/sys/dev/isp/isp_freebsd.c      Wed Jul 15 12:04:12 2015        
(r285600)
@@ -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-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to