svn commit: r290793 - stable/10/sys/dev/isp

[Alexander Motin]

Author: mav
Date: Fri Nov 13 19:51:55 2015
New Revision: 290793
URL: https://svnweb.freebsd.org/changeset/base/290793

Log:
  MFC r289890: Skip reserved IP Broadcast handle from using.

Modified:
  stable/10/sys/dev/isp/isp.c
  stable/10/sys/dev/isp/ispvar.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/isp/isp.c
==============================================================================
--- stable/10/sys/dev/isp/isp.c	Fri Nov 13 19:50:55 2015	(r290792)
+++ stable/10/sys/dev/isp/isp.c	Fri Nov 13 19:51:55 2015	(r290793)
@@ -3164,7 +3164,7 @@ isp_scan_loop(ispsoftc_t *isp, int chan)
 			continue;
 		}
 		if (ISP_CAP_2KLOGIN(isp)) {
-			if (handle >= NPH_RESERVED && handle <= NPH_FL_ID) {
+			if (handle >= NPH_RESERVED && handle <= NPH_IP_BCST) {
 				continue;
 			}
 		}
@@ -4301,8 +4301,8 @@ isp_nxt_handle(ispsoftc_t *isp, int chan
 		if (handle >= FL_ID && handle <= SNS_ID) {
 			handle = SNS_ID+1;
 		}
-		if (handle >= NPH_RESERVED && handle <= NPH_FL_ID) {
-			handle = NPH_FL_ID+1;
+		if (handle >= NPH_RESERVED && handle <= NPH_IP_BCST) {
+			handle = NPH_IP_BCST + 1;
 		}
 		if (ISP_CAP_2KLOGIN(isp)) {
 			if (handle == NPH_MAX_2K) {

Modified: stable/10/sys/dev/isp/ispvar.h
==============================================================================
--- stable/10/sys/dev/isp/ispvar.h	Fri Nov 13 19:50:55 2015	(r290792)
+++ stable/10/sys/dev/isp/ispvar.h	Fri Nov 13 19:51:55 2015	(r290793)
@@ -253,7 +253,7 @@ typedef struct {
 #define	NPH_SNS_ID		0x7FC	/* SNS Server Special ID */
 #define	NPH_FABRIC_CTLR		0x7FD	/* Fabric Controller (0xFFFFFD) */
 #define	NPH_FL_ID		0x7FE	/* F Port Special ID (0xFFFFFE) */
-#define	NPH_IP_BCST		0x7ff	/* IP Broadcast Special ID (0xFFFFFF) */
+#define	NPH_IP_BCST		0x7FF	/* IP Broadcast Special ID (0xFFFFFF) */
 #define	NPH_MAX_2K		0x800
 
 /*