multiple time deltas by numbers

it doesn't make much sense to multiple two time deltas together.

diff --git a/src/lib/io/load.c b/src/lib/io/load.c
index 54eac1de9329e784e91377e84c8aa1e5e36dd81a..fad5700eff479d44ac12b188428b8c75157f2ebb 100644 (file)
--- a/src/lib/io/load.c
+++ b/src/lib/io/load.c
@@ -47,7 +47,7 @@ RCSID("$Id$")
 #define RTTVAR(_rtt, _rttvar, _t) \
        fr_time_delta_div(\
                fr_time_delta_add(\
-                       fr_time_delta_mul(_rttvar, fr_time_delta_wrap(IBETA - 1)), \
+                       fr_time_delta_mul(_rttvar, IBETA - 1), \
                        DIFF(_rtt, _t)\
                ), \
                fr_time_delta_wrap(IBETA)\

diff --git a/src/lib/util/time.h b/src/lib/util/time.h
index 20919d496a8b5632009a1dbd51d92fdfba6b92e4..a4c2e657f30a8de310dd098c7e918ede44607a4d 100644 (file)
--- a/src/lib/util/time.h
+++ b/src/lib/util/time.h
@@ -270,11 +270,11 @@ static inline fr_time_delta_t fr_time_delta_div(fr_time_delta_t a, fr_time_delta
 
        return fr_time_delta_wrap(fr_time_delta_unwrap(a) / fr_time_delta_unwrap(b));
 }
-static inline fr_time_delta_t fr_time_delta_mul(fr_time_delta_t a, fr_time_delta_t b)
+static inline fr_time_delta_t fr_time_delta_mul(fr_time_delta_t a, int64_t b)
 {
        typeof_field(fr_time_delta_t, value) out;
-       if (!fr_multiply(&out, fr_time_delta_unwrap(a), fr_time_delta_unwrap(b))) {
-               return fr_time_delta_overflow_add(a, b);
+       if (!fr_multiply(&out, fr_time_delta_unwrap(a), b)) {
+               return a;
        }
        return fr_time_delta_wrap(out);
 }