diff options
| author | ken <ken@FreeBSD.org> | 2015-03-24 17:20:20 +0000 |
|---|---|---|
| committer | ken <ken@FreeBSD.org> | 2015-03-24 17:20:20 +0000 |
| commit | 109b378db667ffbe17bf557f683da6fadc70f6ad (patch) | |
| tree | a9ece118f67267e40a4d37a8545f3af0bb084349 | |
| parent | ddca3950421c8dc4688a7d241129225cf978819f (diff) | |
| download | FreeBSD-src-109b378db667ffbe17bf557f683da6fadc70f6ad.zip FreeBSD-src-109b378db667ffbe17bf557f683da6fadc70f6ad.tar.gz | |
MFC, r279336:
------------------------------------------------------------------------
r279336 | ken | 2015-02-26 15:22:06 -0700 (Thu, 26 Feb 2015) | 12 lines
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
------------------------------------------------------------------------
| -rw-r--r-- | sys/dev/mpr/mpr_sas.c | 3 | ||||
| -rw-r--r-- | sys/dev/mps/mps_sas.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/mpr/mpr_sas.c b/sys/dev/mpr/mpr_sas.c index 9da1dd5..e87ad21 100644 --- a/sys/dev/mpr/mpr_sas.c +++ b/sys/dev/mpr/mpr_sas.c @@ -3084,7 +3084,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; diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c index cafd5a1..cd651ca 100644 --- a/sys/dev/mps/mps_sas.c +++ b/sys/dev/mps/mps_sas.c @@ -3237,7 +3237,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; |
