svn commit: r299271 - head/sys/dev/mpr

[Stephen McConnell]

Author: slm
Date: Mon May  9 16:31:43 2016
New Revision: 299271
URL: https://svnweb.freebsd.org/changeset/base/299271

Log:
  Use callout_reset_sbt() instead of callout_reset() if FreeBSD ver is >= 1000029
  
  Reviewed by:    ken, scottl, ambrisko, asomers
  Approved by:	ken, scottl, ambrisko
  MFC after:      1 week
  Differential Revision: https://reviews.freebsd.org/D6101

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

Modified: head/sys/dev/mpr/mpr_sas.c
==============================================================================
--- head/sys/dev/mpr/mpr_sas.c	Mon May  9 16:29:25 2016	(r299270)
+++ head/sys/dev/mpr/mpr_sas.c	Mon May  9 16:31:43 2016	(r299271)
@@ -1929,8 +1929,13 @@ mprsas_action_scsiio(struct mprsas_softc
 		cm->cm_desc.SCSIIO.DevHandle = htole16(targ->handle);
 	}
 
+#if __FreeBSD_version >= 1000029
 	callout_reset_sbt(&cm->cm_callout, SBT_1MS * ccb->ccb_h.timeout, 0,
 	    mprsas_scsiio_timeout, cm, 0);
+#else //__FreeBSD_version < 1000029
+	callout_reset(&cm->cm_callout, (ccb->ccb_h.timeout * hz) / 1000,
+	    mprsas_scsiio_timeout, cm);
+#endif //__FreeBSD_version >= 1000029
 
 	targ->issued++;
 	targ->outstanding++;