From 8bfc7e5cf6ef4cea5a685171321c356164aef4e1 Mon Sep 17 00:00:00 2001
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Thu, 28 Apr 2005 12:14:37 -0700
Subject: [PATCH] --- yaml --- r: 542 b: refs/heads/master c:
 7b3c63ac7cb5e2e6680727045aa35c2e5f1bace7 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/pkt_sched.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4ef953fe68c1..3edd106f2501 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89c8b3a11086a2a43ac4240116da77b707f37fbf
+refs/heads/master: 7b3c63ac7cb5e2e6680727045aa35c2e5f1bace7
diff --git a/trunk/include/net/pkt_sched.h b/trunk/include/net/pkt_sched.h
index 87496e3aa330..7352e455053c 100644
--- a/trunk/include/net/pkt_sched.h
+++ b/trunk/include/net/pkt_sched.h
@@ -140,7 +140,7 @@ psched_tod_diff(int delta_sec, int bound)
 	if (bound <= 1000000 || delta_sec > (0x7FFFFFFF/1000000)-1)
 		return bound;
 	delta = delta_sec * 1000000;
-	if (delta > bound)
+	if (delta > bound || delta < 0)
 		delta = bound;
 	return delta;
 }
@@ -156,7 +156,8 @@ psched_tod_diff(int delta_sec, int bound)
 		   __delta += 1000000; \
 	   case 1: \
 		   __delta += 1000000; \
-	   case 0: ; \
+	   case 0: \
+		   __delta = abs(__delta); \
 	   } \
 	   __delta; \
 })