diff options
| author | mav <mav@FreeBSD.org> | 2013-09-01 10:11:00 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2013-09-01 10:11:00 +0000 |
| commit | b9fbab3f866390a63ae0f4eaf7afd3b54d2219e8 (patch) | |
| tree | 529f18a6617d49e255d2bc83c8a50fb4dcc5abbd | |
| parent | c4011595924e79ff02f7f896f09c0b57011ce00d (diff) | |
| download | FreeBSD-src-b9fbab3f866390a63ae0f4eaf7afd3b54d2219e8.zip FreeBSD-src-b9fbab3f866390a63ae0f4eaf7afd3b54d2219e8.tar.gz | |
Fix the build with CTLFEDEBUG, broken by unmapped I/O support changes.
| -rw-r--r-- | sys/cam/ctl/scsi_ctl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c index 97200ca..45acdba 100644 --- a/sys/cam/ctl/scsi_ctl.c +++ b/sys/cam/ctl/scsi_ctl.c @@ -961,23 +961,23 @@ ctlfestart(struct cam_periph *periph, union ccb *start_ccb) /* * 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, |
