From owner-svn-src-stable@freebsd.org  Mon May  1 06:04:35 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 D9844D58FC4;
 Mon,  1 May 2017 06:04:35 +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 A971A17B7;
 Mon,  1 May 2017 06:04:35 +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 v4164Y4N089580;
 Mon, 1 May 2017 06:04:34 GMT (envelope-from mav@FreeBSD.org)
Received: (from mav@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4164YKg089579;
 Mon, 1 May 2017 06:04:34 GMT (envelope-from mav@FreeBSD.org)
Message-Id: <201705010604.v4164YKg089579@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org
 using -f
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 1 May 2017 06:04:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r317635 - stable/11/sys/dev/isp
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 May 2017 06:04:36 -0000

Author: mav
Date: Mon May  1 06:04:34 2017
New Revision: 317635
URL: https://svnweb.freebsd.org/changeset/base/317635

Log:
  MFC r317356: Switch isp_reset to scratchpad not requiring ISP_MBOXDMASETUP.

Modified:
  stable/11/sys/dev/isp/isp.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/isp/isp.c
==============================================================================
--- stable/11/sys/dev/isp/isp.c	Mon May  1 06:03:44 2017	(r317634)
+++ stable/11/sys/dev/isp/isp.c	Mon May  1 06:04:34 2017	(r317635)
@@ -1012,7 +1012,7 @@ isp_reset(ispsoftc_t *isp, int do_load_d
 
 	fwt = isp->isp_fwattr;
 	if (IS_24XX(isp)) {
-		buf = FCPARAM(isp, 0)->isp_scratch;
+		buf = FCPARAM(isp, 0)->isp_scanscratch;
 		ISP_SNPRINTF(buf, ISP_FC_SCRLEN, "Attributes:");
 		if (fwt & ISP2400_FW_ATTR_CLASS2) {
 			fwt ^=ISP2400_FW_ATTR_CLASS2;
@@ -1101,7 +1101,7 @@ isp_reset(ispsoftc_t *isp, int do_load_d
 		}
 		isp_prt(isp, ISP_LOGCONFIG, "%s", buf);
 	} else if (IS_FC(isp)) {
-		buf = FCPARAM(isp, 0)->isp_scratch;
+		buf = FCPARAM(isp, 0)->isp_scanscratch;
 		ISP_SNPRINTF(buf, ISP_FC_SCRLEN, "Attributes:");
 		if (fwt & ISP_FW_ATTR_TMODE) {
 			fwt ^=ISP_FW_ATTR_TMODE;