diff options
author | ken <ken@FreeBSD.org> | 2015-12-07 21:04:27 +0000 |
---|---|---|
committer | ken <ken@FreeBSD.org> | 2015-12-07 21:04:27 +0000 |
commit | 7f1d362dac9d67803ca7ba38b1e2fd8ff43ae14f (patch) | |
tree | 81914e4b659a429c47cf560d13620f5b030550a0 /sys/cam | |
parent | 4ede56bd51a51ee0c426eba3b845bf5c89fb4fc9 (diff) | |
download | FreeBSD-src-7f1d362dac9d67803ca7ba38b1e2fd8ff43ae14f.zip FreeBSD-src-7f1d362dac9d67803ca7ba38b1e2fd8ff43ae14f.tar.gz |
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
Diffstat (limited to 'sys/cam')
-rw-r--r-- | sys/cam/cam_ccb.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index 834e2b7..28abc30 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 */ |