Landing Recent QUIC changes until 01/28/2016 18:41 UTC

net/quic/congestion_control/tcp_cubic_bytes_sender.cc

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/congestion_control/tcp_cubic_bytes_sender.h"
 
 #include <algorithm>
 
 #include "net/quic/congestion_control/prr_sender.h"
 #include "net/quic/congestion_control/rtt_stats.h"
@@ skipping 165 matching lines @@
   }
   ++stats_->tcp_loss_events;
   last_cutback_exited_slowstart_ = InSlowStart();
   if (InSlowStart()) {
     ++stats_->slowstart_packets_lost;
   }
 
   prr_.OnPacketLost(bytes_in_flight);
 
   // TODO(jri): Separate out all of slow start into a separate class.
-  if (slow_start_large_reduction_) {
+  if (slow_start_large_reduction_ && InSlowStart()) {
     DCHECK_LT(kDefaultTCPMSS, congestion_window_);
     congestion_window_ = congestion_window_ - kDefaultTCPMSS;
   } else if (reno_) {
     congestion_window_ = congestion_window_ * RenoBeta();
   } else {
     congestion_window_ =
         cubic_.CongestionWindowAfterPacketLoss(congestion_window_);
   }
   // Enforce TCP's minimum congestion window of 2*MSS.
   if (congestion_window_ < min_congestion_window_) {
@@ skipping 183 matching lines @@
   largest_sent_packet_number_ = 0;
   largest_acked_packet_number_ = 0;
   largest_sent_at_last_cutback_ = 0;
   congestion_window_ = initial_tcp_congestion_window_;
   max_congestion_window_ = initial_max_tcp_congestion_window_;
   slowstart_threshold_ = initial_max_tcp_congestion_window_;
   last_cutback_exited_slowstart_ = false;
 }
 
 }  // namespace net