diff options
author | Linus Torvalds <[email protected]> | 2005-06-23 17:26:31 -0700 |
---|---|---|
committer | Linus Torvalds <[email protected]> | 2005-06-23 17:26:31 -0700 |
commit | a39451c17f53bbae053555670c7b678d46bcebba (patch) | |
tree | 8bb6106ec7812a421c3d3eb9c8c273580cc703fc /net/ipv4/tcp_minisocks.c | |
parent | adb7ee3746b579a7fa7af7c4ec2c8164bc910ed4 (diff) | |
parent | 0e57976b6376f7fda6bef8b7dee2a3c8819ec9e9 (diff) |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/tcp_minisocks.c')
-rw-r--r-- | net/ipv4/tcp_minisocks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index b3943e7562f3..f42a284164b7 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -774,6 +774,8 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req, newtp->frto_counter = 0; newtp->frto_highmark = 0; + newtp->ca_ops = &tcp_reno; + tcp_set_ca_state(newtp, TCP_CA_Open); tcp_init_xmit_timers(newsk); skb_queue_head_init(&newtp->out_of_order_queue); @@ -842,8 +844,6 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req, if (newtp->ecn_flags&TCP_ECN_OK) sock_set_flag(newsk, SOCK_NO_LARGESEND); - tcp_ca_init(newtp); - TCP_INC_STATS_BH(TCP_MIB_PASSIVEOPENS); } return newsk; |