svn commit: r213820 - projects/ofed/head/sys/ofed/include/linux

[Jeff Roberson]

Author: jeff
Date: Thu Oct 14 01:47:07 2010
New Revision: 213820
URL: http://svn.freebsd.org/changeset/base/213820

Log:
   - Linux uses absolute timeout values while FreeBSD uses relative timeout
     values.  Adjust accordingly.  Previously this would produce absurdly
     long timeouts.
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas.

Modified:
  projects/ofed/head/sys/ofed/include/linux/timer.h

Modified: projects/ofed/head/sys/ofed/include/linux/timer.h
==============================================================================
--- projects/ofed/head/sys/ofed/include/linux/timer.h	Thu Oct 14 01:46:20 2010	(r213819)
+++ projects/ofed/head/sys/ofed/include/linux/timer.h	Thu Oct 14 01:47:07 2010	(r213820)
@@ -66,11 +66,12 @@ do {									\
 } while (0)
 
 #define	mod_timer(timer, expire)					\
-	callout_reset(&(timer)->timer_callout, (expire), _timer_fn, (timer))
+	callout_reset(&(timer)->timer_callout, (expire) - jiffies,	\
+	    _timer_fn, (timer))
 
 #define	add_timer(timer)						\
 	callout_reset(&(timer)->timer_callout,				\
-	    (timer)->timer_callout.c_time, _timer_fn, (timer))
+	    (timer)->timer_callout.c_time - jiffies, _timer_fn, (timer))
 
 #define	del_timer(timer)	callout_stop(&(timer)->timer_callout)
 #define	del_timer_sync(timer)	callout_drain(&(timer)->timer_callout)