svn commit: r280448 - in stable/10/sys/dev: mpr mps

[Kenneth D. Merry]

Author: ken
Date: Tue Mar 24 17:20:20 2015
New Revision: 280448
URL: https://svnweb.freebsd.org/changeset/base/280448

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

Modified:
  stable/10/sys/dev/mpr/mpr_sas.c
  stable/10/sys/dev/mps/mps_sas.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/mpr/mpr_sas.c
==============================================================================
--- stable/10/sys/dev/mpr/mpr_sas.c	Tue Mar 24 17:12:36 2015	(r280447)
+++ stable/10/sys/dev/mpr/mpr_sas.c	Tue Mar 24 17:20:20 2015	(r280448)
@@ -3084,7 +3084,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: stable/10/sys/dev/mps/mps_sas.c
==============================================================================
--- stable/10/sys/dev/mps/mps_sas.c	Tue Mar 24 17:12:36 2015	(r280447)
+++ stable/10/sys/dev/mps/mps_sas.c	Tue Mar 24 17:20:20 2015	(r280448)
@@ -3237,7 +3237,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;