From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Thu, 28 Apr 2005 19:14:37 +0000 (-0700)
Subject: [PKT_SCHED]: Fix range in psched_tod_diff() to 0..bound
X-Git-Tag: v2.6.12-rc4~184
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7b3c63ac7cb5e2e6680727045aa35c2e5f1bace7;p=~emulex%2Finfiniband.git

[PKT_SCHED]: Fix range in psched_tod_diff() to 0..bound

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 87496e3aa33..7352e455053 100644
--- a/include/net/pkt_sched.h
+++ b/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; \
 })