diff options
| author | ken <ken@FreeBSD.org> | 2015-02-26 22:22:06 +0000 |
|---|---|---|
| committer | ken <ken@FreeBSD.org> | 2015-02-26 22:22:06 +0000 |
| commit | a505e5ab7a8b81060a8af49d239c3db17783cc32 (patch) | |
| tree | 9464b12b1bc01b3855d8795495673eab6fc56f26 /sys/dev/mps | |
| parent | 362e1f078fadaff7a84bbeebc90b227eee19ecfc (diff) | |
| download | FreeBSD-src-a505e5ab7a8b81060a8af49d239c3db17783cc32.zip FreeBSD-src-a505e5ab7a8b81060a8af49d239c3db17783cc32.tar.gz | |
Add FreeBSD stable/10 version checks for the availability of the
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
Diffstat (limited to 'sys/dev/mps')
| -rw-r--r-- | sys/dev/mps/mps_sas.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c index e919085..26f59c2 100644 --- a/sys/dev/mps/mps_sas.c +++ b/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; |
