From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Tue, 6 Mar 2007 22:24:44 +0000 (-0800)
Subject: [DCCP]: Set RTO for newly created child socket
X-Git-Tag: v2.6.21-rc3~2^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=99c72ce091ec85868a0847e598eb7562dc0d8205;p=linux-2.6-omap-h63xx.git

[DCCP]: Set RTO for newly created child socket

This mirrors a recent change in tcp_open_req_child, whereby the icsk_rto of the
newly created child socket was not set (but rather on the parent socket). Same
fix for DCCP.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 6656bb497c7..6d235b3013d 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -103,7 +103,7 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
 
 	if (newsk != NULL) {
 		const struct dccp_request_sock *dreq = dccp_rsk(req);
-		struct inet_connection_sock *newicsk = inet_csk(sk);
+		struct inet_connection_sock *newicsk = inet_csk(newsk);
 		struct dccp_sock *newdp = dccp_sk(newsk);
 		struct dccp_minisock *newdmsk = dccp_msk(newsk);