From dfed909b1f6ab0fd623ce98e0baab178e3b0afde Mon Sep 17 00:00:00 2001
From: Guillaume Chazarain <guichaz@yahoo.fr>
Date: Sun, 23 Jul 2006 23:37:24 -0700
Subject: [PATCH] --- yaml --- r: 32811 b: refs/heads/master c:
 2266d8886f64c66e0a4e61e3e1c19dbc27ed00d4 h: refs/heads/master i:   32809:
 755aa6336dbf9f1e752e01a35146c1cf7a615f82   32807:
 822ac699984b590dc9c55d25bf70ee7a8b576dad v: v3

---
 [refs]                        |  2 +-
 trunk/include/net/pkt_sched.h | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index daecaa96ea8b..dc662b450971 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b79f0af48d529a360d3529def01835dc5d45fe1
+refs/heads/master: 2266d8886f64c66e0a4e61e3e1c19dbc27ed00d4
diff --git a/trunk/include/net/pkt_sched.h b/trunk/include/net/pkt_sched.h
index 1925c65e617b..f6afee73235d 100644
--- a/trunk/include/net/pkt_sched.h
+++ b/trunk/include/net/pkt_sched.h
@@ -169,23 +169,17 @@ psched_tod_diff(int delta_sec, int bound)
 
 #define PSCHED_TADD2(tv, delta, tv_res) \
 ({ \
-	   int __delta = (delta); \
-	   (tv_res) = (tv); \
-	   while(__delta >= USEC_PER_SEC){ \
-		 (tv_res).tv_sec++; \
-		 __delta -= USEC_PER_SEC; \
-	   } \
+	   int __delta = (tv).tv_usec + (delta); \
+	   (tv_res).tv_sec = (tv).tv_sec; \
+	   while (__delta >= USEC_PER_SEC) { (tv_res).tv_sec++; __delta -= USEC_PER_SEC; } \
 	   (tv_res).tv_usec = __delta; \
 })
 
 #define PSCHED_TADD(tv, delta) \
 ({ \
-	   int __delta = (delta); \
-	   while(__delta >= USEC_PER_SEC){ \
-		 (tv).tv_sec++; \
-		 __delta -= USEC_PER_SEC; \
-	   } \
-	   (tv).tv_usec = __delta; \
+	   (tv).tv_usec += (delta); \
+	   while ((tv).tv_usec >= USEC_PER_SEC) { (tv).tv_sec++; \
+		 (tv).tv_usec -= USEC_PER_SEC; } \
 })
 
 /* Set/check that time is in the "past perfect";