diff options
| author | Kenneth D. Merry <ken@FreeBSD.org> | 2015-12-07 21:04:27 +0000 |
|---|---|---|
| committer | Kenneth D. Merry <ken@FreeBSD.org> | 2015-12-07 21:04:27 +0000 |
| commit | 23d63288c2d79b9355a24fc35381fb62ea12035a (patch) | |
| tree | 81914e4b659a429c47cf560d13620f5b030550a0 /sys/cam/cam_ccb.h | |
| parent | be90c1c6b5a2bb21b480b5cfe1acc10489ce2070 (diff) | |
| download | src-23d63288c2d79b9355a24fc35381fb62ea12035a.tar.gz src-23d63288c2d79b9355a24fc35381fb62ea12035a.zip | |
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
Notes
Notes:
svn path=/head/; revision=291960
Diffstat (limited to 'sys/cam/cam_ccb.h')
| -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 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 */ |