X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fipv4%2Ftcp_output.c;h=bc5fba4a39fd0bbd578d21bc0aefd1c2be7f326d;hb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;hp=7cae8de08fd0105f377fc51307be70a1f210088d;hpb=c449269f45c2cdf53af08c8d0af37472f66539d9;p=linux-2.6.git

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 7cae8de08..bc5fba4a3 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1389,8 +1389,7 @@ void tcp_send_delayed_ack(struct sock *sk)
 	}
 	tp->ack.pending |= TCP_ACK_SCHED|TCP_ACK_TIMER;
 	tp->ack.timeout = timeout;
-	if (!mod_timer(&tp->delack_timer, timeout))
-		sock_hold(sk);
+	sk_reset_timer(sk, &tp->delack_timer, timeout);
 }
 
 /* This routine sends an ack and also updates the window. */