From 23ffae5a0305e8e6fa19791dae40c4585746d956 Mon Sep 17 00:00:00 2001 From: mav Date: Fri, 13 Nov 2015 19:51:55 +0000 Subject: [PATCH] MFC r289890: Skip reserved IP Broadcast handle from using. git-svn-id: svn://svn.freebsd.org/base/stable/10@290793 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/dev/isp/isp.c | 6 +++--- sys/dev/isp/ispvar.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index 920ec9c12..2bd85a3fb 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -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, uint16_t handle) 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) { diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h index 78a999d1b..1657915e5 100644 --- a/sys/dev/isp/ispvar.h +++ b/sys/dev/isp/ispvar.h @@ -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 /* -- 2.45.2