Author: mav
Date: Sat Sep 14 09:50:44 2013
New Revision: 255557
URL: http://svnweb.freebsd.org/changeset/base/255557
Log:
MFC r255117:
Fix the build with CTLFEDEBUG, broken by unmapped I/O support changes.
Modified:
stable/9/sys/cam/ctl/scsi_ctl.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/cam/ctl/scsi_ctl.c
==============================================================================
--- stable/9/sys/cam/ctl/scsi_ctl.c Sat Sep 14 09:49:18 2013
(r255556)
+++ stable/9/sys/cam/ctl/scsi_ctl.c Sat Sep 14 09:50:44 2013
(r255557)
@@ -962,23 +962,23 @@ ctlfestart(struct cam_periph *periph, un
/*
* Valid combinations:
- * - CAM_SEND_STATUS, SCATTER_VALID = 0, dxfer_len = 0,
+ * - CAM_SEND_STATUS, CAM_DATA_SG = 0, dxfer_len = 0,
* sglist_cnt = 0
- * - CAM_SEND_STATUS = 0, SCATTER_VALID = 0, dxfer_len != 0,
+ * - CAM_SEND_STATUS = 0, CAM_DATA_SG = 0, dxfer_len != 0,
* sglist_cnt = 0
- * - CAM_SEND_STATUS = 0, SCATTER_VALID, dxfer_len != 0,
+ * - CAM_SEND_STATUS = 0, CAM_DATA_SG, dxfer_len != 0,
* sglist_cnt != 0
*/
#ifdef CTLFEDEBUG
if (((flags & CAM_SEND_STATUS)
- && (((flags & CAM_SCATTER_VALID) != 0)
+ && (((flags & CAM_DATA_SG) != 0)
|| (dxfer_len != 0)
|| (csio->sglist_cnt != 0)))
|| (((flags & CAM_SEND_STATUS) == 0)
&& (dxfer_len == 0))
- || ((flags & CAM_SCATTER_VALID)
+ || ((flags & CAM_DATA_SG)
&& (csio->sglist_cnt == 0))
- || (((flags & CAM_SCATTER_VALID) == 0)
+ || (((flags & CAM_DATA_SG) == 0)
&& (csio->sglist_cnt != 0))) {
printf("%s: tag %04x cdb %02x flags %#x dxfer_len "
"%d sg %u\n", __func__, atio->tag_id,
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
