PERFORCE change 166049 for review

[John Baldwin]

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

Change 166049 by jhb at 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.