2 files changed, 1 insertions, 9 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 731b1c6e88a9..3f99ad92eaed 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2578,10 +2578,10 @@ int tcp_disconnect(struct sock *sk, int flags)
         if (tp->write_seq == 0)
                 tp->write_seq = 1;
         icsk->icsk_backoff = 0;
-        tp->snd_cwnd = 2;
         icsk->icsk_probes_out = 0;
         icsk->icsk_rto = TCP_TIMEOUT_INIT;
         tp->snd_ssthresh = TCP_INFINITE_SSTHRESH;
+        tp->snd_cwnd = TCP_INIT_CWND;
         tp->snd_cwnd_cnt = 0;
         tp->window_clamp = 0;
         tp->delivered_ce = 0;
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
index 35906b44e2cf..ca96e7da99b6 100644
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
@@ -490,14 +490,6 @@ struct sock *tcp_create_openreq_child(const struct sock *sk,
         newtp->last_oow_ack_time = 0;
         newtp->total_retrans = req->num_retrans;
 
-        /* So many TCP implementations out there (incorrectly) count the
-         * initial SYN frame in their delayed-ACK and congestion control
-         * algorithms that we must have the following bandaid to talk
-         * efficiently to them.  -DaveM
-         */
-        newtp->snd_cwnd = TCP_INIT_CWND;
-        newtp->snd_cwnd_cnt = 0;
-
         /* There's a bubble in the pipe until at least the first ACK. */
         newtp->app_limited = ~0U;