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

net/quic/congestion_control/tcp_cubic_sender.cc

 // Copyright (c) 2012 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_sender.h"
 
 #include <algorithm>
 
 #include "base/metrics/histogram_macros.h"
 #include "net/quic/congestion_control/prr_sender.h"
@@ skipping 179 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(1u, congestion_window_);
     congestion_window_ = congestion_window_ - 1;
   } else if (reno_) {
     congestion_window_ = congestion_window_ * RenoBeta();
   } else {
     congestion_window_ =
         cubic_.CongestionWindowAfterPacketLoss(congestion_window_);
   }
   // Enforce a minimum congestion window.
   if (congestion_window_ < min_congestion_window_) {
@@ skipping 180 matching lines @@
   slowstart_threshold_ = initial_max_tcp_congestion_window_;
   last_cutback_exited_slowstart_ = false;
   max_tcp_congestion_window_ = initial_max_tcp_congestion_window_;
 }
 
 CongestionControlType TcpCubicSender::GetCongestionControlType() const {
   return reno_ ? kReno : kCubic;
 }
 
 }  // namespace net