svn commit: r279336 - in head/sys/dev: mpr mps

[Kenneth D. Merry]

Author: ken
Date: Thu Feb 26 22:22:06 2015
New Revision: 279336
URL: https://svnweb.freebsd.org/changeset/base/279336

Log:
  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

Modified:
  head/sys/dev/mpr/mpr_sas.c
  head/sys/dev/mps/mps_sas.c

Modified: head/sys/dev/mpr/mpr_sas.c
==============================================================================
--- head/sys/dev/mpr/mpr_sas.c	Thu Feb 26 21:30:40 2015	(r279335)
+++ head/sys/dev/mpr/mpr_sas.c	Thu Feb 26 22:22:06 2015	(r279336)
@@ -3082,7 +3082,8 @@ mprsas_async(void *callback_arg, uint32_
 		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;

Modified: head/sys/dev/mps/mps_sas.c
==============================================================================
--- head/sys/dev/mps/mps_sas.c	Thu Feb 26 21:30:40 2015	(r279335)
+++ head/sys/dev/mps/mps_sas.c	Thu Feb 26 22:22:06 2015	(r279336)
@@ -3277,7 +3277,8 @@ mpssas_async(void *callback_arg, uint32_
 		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;