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
This commit is contained in:
Kenneth D. Merry 2015-12-07 21:04:27 +00:00
parent be90c1c6b5
commit 23d63288c2

View File

@ -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 */