From owner-svn-src-all@freebsd.org Fri Nov 13 19:51:56 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9D3CDA2EB4B; Fri, 13 Nov 2015 19:51:56 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 676211CE2; Fri, 13 Nov 2015 19:51:56 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tADJptJS098678; Fri, 13 Nov 2015 19:51:55 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tADJptEa098676; Fri, 13 Nov 2015 19:51:55 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201511131951.tADJptEa098676@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 13 Nov 2015 19:51:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r290793 - stable/10/sys/dev/isp X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Nov 2015 19:51:56 -0000 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 /*