d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add FreeBSD stable/10 version checks for the availability of the

Browse Source 
CDAI_FLAG_NONE advanced information CCB flag.

Support for the flag was merged to stable/10 in r279329, and the
__FreeBSD_version in stable/10 was bumped to 1001510.

Check for that version in the mps(4) and mpr(4) drivers when determining
whether to use the flag.

Sponsored by:	Spectra Logic
MFC after:	3 days
This commit is contained in:
Kenneth D. Merry 2015-02-26 22:22:06 +00:00
parent c4b725f42a
commit 6c0541fa8e
2 changed files with 4 additions and 2 deletions
sys/dev
mpr
mpr_sas.c
mps
mps_sas.c

3
sys/dev/mpr/mpr_sas.c

@ -3082,7 +3082,8 @@ mprsas_async(void *callback_arg, uint32_t code, struct cam_path *path,
cdai.ccb_h.func_code = XPT_DEV_ADVINFO;
cdai.ccb_h.flags = CAM_DIR_IN;
cdai.buftype = CDAI_TYPE_RCAPLONG;
#if __FreeBSD_version >= 1100061
#if (__FreeBSD_version >= 1100061) || \
((__FreeBSD_version >= 1001510) && (__FreeBSD_version < 1100000))
cdai.flags = CDAI_FLAG_NONE;
#else
cdai.flags = 0;

3
sys/dev/mps/mps_sas.c

@ -3277,7 +3277,8 @@ mpssas_async(void *callback_arg, uint32_t code, struct cam_path *path,
cdai.ccb_h.func_code = XPT_DEV_ADVINFO;
cdai.ccb_h.flags = CAM_DIR_IN;
cdai.buftype = CDAI_TYPE_RCAPLONG;
#if __FreeBSD_version >= 1100061
#if (__FreeBSD_version >= 1100061) || \
((__FreeBSD_version >= 1001510) && (__FreeBSD_version < 1100000))
cdai.flags = CDAI_FLAG_NONE;
#else
cdai.flags = 0;