diff --git a/[refs] b/[refs] index 504aaff39cab..24716ba48cd7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27258ee54f8cd4a43d09319aa5448145afc2cb8d +refs/heads/master: 0b4e03bf0bc43ad6250a1e2fa25fc3eb2b028977 diff --git a/trunk/net/dccp/ipv4.c b/trunk/net/dccp/ipv4.c index 4fa56dbcbea4..6bccf4dd1e70 100644 --- a/trunk/net/dccp/ipv4.c +++ b/trunk/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;