From 273968cf2d0343b2f4e3217f25c0752f20cf03c5 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Mon, 3 Jan 2022 10:34:52 -0800 Subject: tcp: cast timer ticks to u32 tc->rto * TCP_TO_TIMER_TICK can return garbage if not cast to u32 and that confuses clib_max Type: fix Signed-off-by: Florin Coras signed-off-by: Vipul Agrawal Change-Id: Ief4d29b9625e2ef2e75e0c7e3d731ab147465f6d --- src/vnet/tcp/tcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/vnet/tcp/tcp.c') diff --git a/src/vnet/tcp/tcp.c b/src/vnet/tcp/tcp.c index af985d2de86..3d3cc886024 100644 --- a/src/vnet/tcp/tcp.c +++ b/src/vnet/tcp/tcp.c @@ -1438,7 +1438,8 @@ tcp_expired_timers_dispatch (u32 * expired_timers) clib_fifo_add (wrk->pending_timers, expired_timers, n_expired); - max_loops = clib_max (1, 0.5 * TCP_TIMER_TICK * wrk->vm->loops_per_second); + max_loops = + clib_max ((u32) 0.5 * TCP_TIMER_TICK * wrk->vm->loops_per_second, 1); max_per_loop = clib_max ((n_left + n_expired) / max_loops, 10); max_per_loop = clib_min (max_per_loop, VLIB_FRAME_SIZE); wrk->max_timers_per_loop = clib_max (n_left ? wrk->max_timers_per_loop : 0, -- cgit 1.2.3-korg