From 23d63288c2d79b9355a24fc35381fb62ea12035a Mon Sep 17 00:00:00 2001 From: "Kenneth D. Merry" Date: Mon, 7 Dec 2015 21:04:27 +0000 Subject: [PATCH] The ccb_xflags enumeration was removed from FreeBSD/head in r259397 (it contained the CAM_EXTLUN_VALID bit) and I added the same type name with a different set of values back in r291716. The old ccb_xflags enumeration still exists in FreeBSD stable/10. Shift all of the new values by one bit to avoid compatibility issues when merged to stable/10. MFC after: 3 days Sponsored by: Spectra Logic --- sys/cam/cam_ccb.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index 834e2b7f72da..28abc30beaad 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -110,9 +110,9 @@ typedef enum { } ccb_flags; typedef enum { - CAM_USER_DATA_ADDR = 0x00000001,/* Userspace data pointers */ - CAM_SG_FORMAT_IOVEC = 0x00000002,/* iovec instead of busdma S/G*/ - CAM_UNMAPPED_BUF = 0x00000004 /* use unmapped I/O */ + CAM_USER_DATA_ADDR = 0x00000002,/* Userspace data pointers */ + CAM_SG_FORMAT_IOVEC = 0x00000004,/* iovec instead of busdma S/G*/ + CAM_UNMAPPED_BUF = 0x00000008 /* use unmapped I/O */ } ccb_xflags; /* XPT Opcodes for xpt_action */