[TCP]: Revert 6b251858d377196b8cea20e65cae60f584a42735

[deliverable/linux.git] / net / ipv4 / tcp_output.c

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index caf2e2cff29365ece4d1075ac2eae72c7bf12816..c5b911f9b662cb33b959755cebd3f2fb8d8c7fe0 100644 (file)
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -194,12 +194,11 @@ void tcp_select_initial_window(int __space, __u32 mss,
         * will be satisfied with 2.
         */
        if (mss > (1<<*rcv_wscale)) {
-               int init_cwnd;
-
-               if (mss > 1460)
+               int init_cwnd = 4;
+               if (mss > 1460*3)
                        init_cwnd = 2;
-               else
-                       init_cwnd = (mss > 1095) ? 3 : 4;
+               else if (mss > 1460)
+                       init_cwnd = 3;
                if (*rcv_wnd > init_cwnd*mss)
                        *rcv_wnd = init_cwnd*mss;
        }