Merge from Linus' tree

1 files changed, 0 insertions, 2 deletions

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index a7537c7bbd06..677419d0c9ad 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -355,8 +355,6 @@ static void tcp_clamp_window(struct sock *sk, struct tcp_sock *tp)
                         app_win -= icsk->icsk_ack.rcv_mss;
                 app_win = max(app_win, 2U*tp->advmss);
 
-                if (!ofo_win)
-                        tp->window_clamp = min(tp->window_clamp, app_win);
                 tp->rcv_ssthresh = min(tp->window_clamp, 2U*tp->advmss);
         }
 }