[PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000

Signed-off-by: Shuya MAEDA <maeda-sxb@necst.nec.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 12 insertions, 6 deletions

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 75b5b9333fc7..1925c65e617b 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -169,17 +169,23 @@ psched_tod_diff(int delta_sec, int bound)
 
 #define PSCHED_TADD2(tv, delta, tv_res) \
 ({ \
-           int __delta = (tv).tv_usec + (delta); \
-           (tv_res).tv_sec = (tv).tv_sec; \
-           if (__delta > USEC_PER_SEC) { (tv_res).tv_sec++; __delta -= USEC_PER_SEC; } \
+           int __delta = (delta); \
+           (tv_res) = (tv); \
+           while(__delta >= USEC_PER_SEC){ \
+                 (tv_res).tv_sec++; \
+                 __delta -= USEC_PER_SEC; \
+           } \
            (tv_res).tv_usec = __delta; \
 })
 
 #define PSCHED_TADD(tv, delta) \
 ({ \
-           (tv).tv_usec += (delta); \
-           if ((tv).tv_usec > USEC_PER_SEC) { (tv).tv_sec++; \
-                 (tv).tv_usec -= USEC_PER_SEC; } \
+           int __delta = (delta); \
+           while(__delta >= USEC_PER_SEC){ \
+                 (tv).tv_sec++; \
+                 __delta -= USEC_PER_SEC; \
+           } \
+           (tv).tv_usec = __delta; \
 })
 
 /* Set/check that time is in the "past perfect";