From: Arnaldo Carvalho de Melo <acme@mandriva.com>
Date: Wed, 10 Aug 2005 03:31:11 +0000 (-0700)
Subject: [DCCP]: Initialize icsk_rto in dccp_v4_init_sock
X-Git-Tag: v2.6.14-rc1~1035^2~123
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0b4e03bf0bc43ad6250a1e2fa25fc3eb2b028977;p=linux-2.6-omap-h63xx.git

[DCCP]: Initialize icsk_rto in dccp_v4_init_sock

Fixes nasty bug related to the retransmit timer (yeah, DCCP does
retransmits) firing too early.

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 4fa56dbcbea..6bccf4dd1e7 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -1219,6 +1219,7 @@ static int dccp_v4_init_sock(struct sock *sk)
 		dccp_ctl_socket_init = 0;
 
 	dccp_init_xmit_timers(sk);
+	inet_csk(sk)->icsk_rto = DCCP_TIMEOUT_INIT;
 	sk->sk_state = DCCP_CLOSED;
 	dp->dccps_mss_cache = 536;
 	dp->dccps_role = DCCP_ROLE_UNDEFINED;