From owner-p4-projects@FreeBSD.ORG  Mon Jul 13 21:40:00 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BD2F21065673; Mon, 13 Jul 2009 21:39:59 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7D69E106564A
	for <perforce@freebsd.org>; Mon, 13 Jul 2009 21:39:59 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6D10D8FC12
	for <perforce@freebsd.org>; Mon, 13 Jul 2009 21:39:59 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6DLdxZE062410
	for <perforce@freebsd.org>; Mon, 13 Jul 2009 21:39:59 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6DLdxiV062408
	for perforce@freebsd.org; Mon, 13 Jul 2009 21:39:59 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 13 Jul 2009 21:39:59 GMT
Message-Id: <200907132139.n6DLdxiV062408@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 166049 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jul 2009 21:40:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=166049

Change 166049 by jhb@jhb_jhbbsd on 2009/07/13 21:39:20

	IFC @166047

Affected files ...

.. //depot/projects/smpng/sys/cam/ata/ata_xpt.c#2 integrate
.. //depot/projects/smpng/sys/dev/ciss/cissvar.h#13 integrate

Differences ...

==== //depot/projects/smpng/sys/cam/ata/ata_xpt.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.2 2009/07/13 06:12:21 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.3 2009/07/13 21:21:30 mav Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -1204,7 +1204,7 @@
 				    scan_info->request_ccb->ccb_h.path, 1);
 				cts.ccb_h.func_code = XPT_SET_TRAN_SETTINGS;
 				cts.type = CTS_TYPE_CURRENT_SETTINGS;
-				cts.xport_specific.sata.pm_present = 1;
+				cts.xport_specific.sata.pm_present = 0;
 				cts.xport_specific.sata.valid = CTS_SATA_VALID_PM;
 				xpt_action((union ccb *)&cts);
 			}

==== //depot/projects/smpng/sys/dev/ciss/cissvar.h#13 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/ciss/cissvar.h,v 1.13 2009/07/10 08:18:08 scottl Exp $
+ *	$FreeBSD: src/sys/dev/ciss/cissvar.h,v 1.14 2009/07/13 20:19:29 scottl Exp $
  */
 
 /*
@@ -142,7 +142,7 @@
 				 / sizeof(struct ciss_sg_entry))
 
 /* XXX Prep for increasing max i/o */
-#define CISS_MAX_SG_ELEMENTS   33
+#define CISS_MAX_SG_ELEMENTS   17
 
 /*
  * Per-logical-drive data.