From 5fa6775b617d4e2b7911c062996fd5ffe799e4cb Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 15 Jun 2010 18:16:02 +0100 Subject: [PATCH] [retry] Use start_timer_fixed() instead of direct timeout manipulation Signed-off-by: Michael Brown --- src/net/ipv4.c | 3 +-- src/net/tcp.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/net/ipv4.c b/src/net/ipv4.c index 2354097b..95486527 100644 --- a/src/net/ipv4.c +++ b/src/net/ipv4.c @@ -225,8 +225,7 @@ static struct io_buffer * ipv4_reassemble ( struct io_buffer * iobuf ) { /* Set the reassembly timer */ timer_init ( &fragbuf->frag_timer, ipv4_frag_expired ); - fragbuf->frag_timer.timeout = IP_FRAG_TIMEOUT; - start_timer ( &fragbuf->frag_timer ); + start_timer_fixed ( &fragbuf->frag_timer, IP_FRAG_TIMEOUT ); /* Add the fragment buffer to the list of fragment buffers */ list_add ( &fragbuf->list, &frag_buffers ); diff --git a/src/net/tcp.c b/src/net/tcp.c index 118c6d0f..b5b9ff60 100644 --- a/src/net/tcp.c +++ b/src/net/tcp.c @@ -1016,8 +1016,7 @@ static int tcp_rx ( struct io_buffer *iobuf, * timer to expire and cause the connection to be freed. */ if ( TCP_CLOSED_GRACEFULLY ( tcp->tcp_state ) ) { - tcp->timer.timeout = ( 2 * TCP_MSL ); - start_timer ( &tcp->timer ); + start_timer_fixed ( &tcp->timer, ( 2 * TCP_MSL ) ); } return 0;