From owner-svn-src-all@FreeBSD.ORG  Sat Mar  2 22:19:18 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 06A8699B;
 Sat,  2 Mar 2013 22:19:18 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D66666CF;
 Sat,  2 Mar 2013 22:19:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r22MJH6c065174;
 Sat, 2 Mar 2013 22:19:17 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r22MJHKh065172;
 Sat, 2 Mar 2013 22:19:17 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201303022219.r22MJHKh065172@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 2 Mar 2013 22:19:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247671 - head/sys/ofed/include/linux
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Mar 2013 22:19:18 -0000

Author: mav
Date: Sat Mar  2 22:19:17 2013
New Revision: 247671
URL: http://svnweb.freebsd.org/changeset/base/247671

Log:
  MFcalloutng:
  Give OFED Linux wrapper own "expires" field instead of abusing callout's
  c_time, which will change its type and units with calloutng commit.

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

Modified: head/sys/ofed/include/linux/timer.h
==============================================================================
--- head/sys/ofed/include/linux/timer.h	Sat Mar  2 21:59:07 2013	(r247670)
+++ head/sys/ofed/include/linux/timer.h	Sat Mar  2 22:19:17 2013	(r247671)
@@ -37,11 +37,10 @@
 struct timer_list {
 	struct callout	timer_callout;
 	void		(*function)(unsigned long);
-        unsigned long	data;
+	unsigned long	data;
+	unsigned long	expires;
 };
 
-#define	expires	timer_callout.c_time
-
 static inline void
 _timer_fn(void *context)
 {
@@ -65,13 +64,16 @@ do {									\
 	callout_init(&(timer)->timer_callout, CALLOUT_MPSAFE);		\
 } while (0)
 
-#define	mod_timer(timer, expire)					\
-	callout_reset(&(timer)->timer_callout, (expire) - jiffies,	\
-	    _timer_fn, (timer))
+#define	mod_timer(timer, exp)						\
+do {									\
+	(timer)->expires = exp;						\
+	callout_reset(&(timer)->timer_callout, (exp) - jiffies,		\
+	    _timer_fn, (timer));					\
+} while (0)
 
 #define	add_timer(timer)						\
 	callout_reset(&(timer)->timer_callout,				\
-	    (timer)->timer_callout.c_time - jiffies, _timer_fn, (timer))
+	    (timer)->expires - jiffies, _timer_fn, (timer))
 
 #define	del_timer(timer)	callout_stop(&(timer)->timer_callout)
 #define	del_timer_sync(timer)	callout_drain(&(timer)->timer_callout)