From 57a800d45a5f8f46c9ce4950599f17545413c82d Mon Sep 17 00:00:00 2001 From: Andreas Henriksson Date: Fri, 12 Oct 2007 13:49:49 +0200 Subject: [PATCH] Switch helpers tc_core_{time2ktime,ktime2time} from long to unsigned as well. Follow up patch to "Fix overflow in time2tick / tick2time." which switches the remaining two helper functions from long to unsigned as well. These functions are only used in "tc/q_hfsc.c" where both the passed argument and the place the return value is stored are unsigned/u32 variables, so this change should be safe to make but hasn't been tested as extensively as the time2tick patch. Signed-off-by: Andreas Henriksson Signed-off-by: Stephen Hemminger --- tc/tc_core.c | 4 ++-- tc/tc_core.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tc/tc_core.c b/tc/tc_core.c index fb89876..8c3a2ac 100644 --- a/tc/tc_core.c +++ b/tc/tc_core.c @@ -45,12 +45,12 @@ unsigned tc_core_tick2time(unsigned tick) return tick/tick_in_usec; } -long tc_core_time2ktime(long time) +unsigned tc_core_time2ktime(unsigned time) { return time * clock_factor; } -long tc_core_ktime2time(long ktime) +unsigned tc_core_ktime2time(unsigned ktime) { return ktime / clock_factor; } diff --git a/tc/tc_core.h b/tc/tc_core.h index b2a16bc..b1ede1e 100644 --- a/tc/tc_core.h +++ b/tc/tc_core.h @@ -9,8 +9,8 @@ int tc_core_time2big(long time); unsigned tc_core_time2tick(unsigned time); unsigned tc_core_tick2time(unsigned tick); -long tc_core_time2ktime(long time); -long tc_core_ktime2time(long ktime); +unsigned tc_core_time2ktime(unsigned time); +unsigned tc_core_ktime2time(unsigned ktime); unsigned tc_calc_xmittime(unsigned rate, unsigned size); unsigned tc_calc_xmitsize(unsigned rate, unsigned ticks); int tc_calc_rtable(unsigned bps, __u32 *rtab, int cell_log, unsigned mtu, unsigned mpu); -- 2.39.2