1 files changed, 4 insertions, 21 deletions

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index fe7855b090e4..059b67af28b1 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -195,21 +195,6 @@ static inline void tcp_event_ack_sent(struct sock *sk, unsigned int pkts,
         inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK);
 }
 
-
-u32 tcp_default_init_rwnd(u32 mss)
-{
-        /* Initial receive window should be twice of TCP_INIT_CWND to
-         * enable proper sending of new unsent data during fast recovery
-         * (RFC 3517, Section 4, NextSeg() rule (2)). Further place a
-         * limit when mss is larger than 1460.
-         */
-        u32 init_rwnd = TCP_INIT_CWND * 2;
-
-        if (mss > 1460)
-                init_rwnd = max((1460 * init_rwnd) / mss, 2U);
-        return init_rwnd;
-}
-
 /* Determine a window scaling and initial window to offer.
  * Based on the assumption that the given amount of space
  * will be offered. Store the results in the tp structure.
@@ -244,7 +229,10 @@ void tcp_select_initial_window(const struct sock *sk, int __space, __u32 mss,
         if (sock_net(sk)->ipv4.sysctl_tcp_workaround_signed_windows)
                 (*rcv_wnd) = min(space, MAX_TCP_WINDOW);
         else
-                (*rcv_wnd) = space;
+                (*rcv_wnd) = min_t(u32, space, U16_MAX);
+
+        if (init_rcv_wnd)
+                *rcv_wnd = min(*rcv_wnd, init_rcv_wnd * mss);
 
         (*rcv_wscale) = 0;
         if (wscale_ok) {
@@ -257,11 +245,6 @@ void tcp_select_initial_window(const struct sock *sk, int __space, __u32 mss,
                         (*rcv_wscale)++;
                 }
         }
-
-        if (!init_rcv_wnd) /* Use default unless specified otherwise */
-                init_rcv_wnd = tcp_default_init_rwnd(mss);
-        *rcv_wnd = min(*rcv_wnd, init_rcv_wnd * mss);
-
         /* Set the clamp no higher than max representable value */
         (*window_clamp) = min_t(__u32, U16_MAX << (*rcv_wscale), *window_clamp);
 }