Landing Recent QUIC changes until 5/14/2016 02:25:25 UTC

net/quic/congestion_control/tcp_cubic_sender_bytes.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_sender_bytes.h"
 
 #include <algorithm>
 
 #include "net/quic/congestion_control/prr_sender.h"
 #include "net/quic/congestion_control/rtt_stats.h"
@@ skipping 37 matching lines @@
 TcpCubicSenderBytes::~TcpCubicSenderBytes() {}
 
 void TcpCubicSenderBytes::SetCongestionWindowFromBandwidthAndRtt(
     QuicBandwidth bandwidth,
     QuicTime::Delta rtt) {
   QuicByteCount new_congestion_window = bandwidth.ToBytesPerPeriod(rtt);
   if (FLAGS_quic_no_lower_bw_resumption_limit) {
     // Limit new CWND if needed.
     congestion_window_ =
         max(min_congestion_window_,
-            min(new_congestion_window, kMaxCongestionWindow * kDefaultTCPMSS));
+            min(new_congestion_window,
+                kMaxResumptionCongestionWindow * kDefaultTCPMSS));
   } else {
     congestion_window_ =
-        max(min(new_congestion_window, kMaxCongestionWindow * kDefaultTCPMSS),
+        max(min(new_congestion_window,
+                kMaxResumptionCongestionWindow * kDefaultTCPMSS),
             kMinCongestionWindowForBandwidthResumption * kDefaultTCPMSS);
   }
 }
 
 void TcpCubicSenderBytes::SetCongestionWindowInPackets(
     QuicPacketCount congestion_window) {
   congestion_window_ = congestion_window * kDefaultTCPMSS;
 }
 
 void TcpCubicSenderBytes::SetMinCongestionWindowInPackets(
@@ skipping 138 matching lines @@
   congestion_window_ = initial_tcp_congestion_window_;
   max_congestion_window_ = initial_max_tcp_congestion_window_;
   slowstart_threshold_ = initial_max_tcp_congestion_window_;
 }
 
 CongestionControlType TcpCubicSenderBytes::GetCongestionControlType() const {
   return reno_ ? kRenoBytes : kCubicBytes;
 }
 
 }  // namespace net