Index: net/quic/congestion_control/tcp_cubic_sender.cc |
diff --git a/net/quic/congestion_control/tcp_cubic_sender.cc b/net/quic/congestion_control/tcp_cubic_sender.cc |
index 4de453eec338419d70979d47ac840c589341579b..4d77451924290fc659d278a921fb012a36d81a78 100644 |
--- a/net/quic/congestion_control/tcp_cubic_sender.cc |
+++ b/net/quic/congestion_control/tcp_cubic_sender.cc |
@@ -44,9 +44,7 @@ TcpCubicSender::TcpCubicSender(const QuicClock* clock, |
largest_acked_sequence_number_(0), |
largest_sent_at_last_cutback_(0), |
congestion_window_(initial_tcp_congestion_window), |
- previous_congestion_window_(0), |
slowstart_threshold_(max_tcp_congestion_window), |
- previous_slowstart_threshold_(0), |
last_cutback_exited_slowstart_(false), |
max_tcp_congestion_window_(max_tcp_congestion_window), |
clock_(clock) { |
@@ -139,8 +137,6 @@ void TcpCubicSender::OnPacketAcked( |
QuicByteCount bytes_in_flight) { |
largest_acked_sequence_number_ = max(acked_sequence_number, |
largest_acked_sequence_number_); |
- // As soon as a packet is acked, ensure we're no longer in RTO mode. |
- previous_congestion_window_ = 0; |
if (InRecovery()) { |
// PRR is used when in recovery. |
prr_.OnPacketAcked(acked_bytes); |
@@ -348,26 +344,10 @@ void TcpCubicSender::OnRetransmissionTimeout(bool packets_retransmitted) { |
} |
cubic_.Reset(); |
hybrid_slow_start_.Restart(); |
- // Only reduce ssthresh once over multiple retransmissions. |
- if (previous_congestion_window_ != 0) { |
- return; |
- } |
- previous_slowstart_threshold_ = slowstart_threshold_; |
slowstart_threshold_ = congestion_window_ / 2; |
- previous_congestion_window_ = congestion_window_; |
congestion_window_ = kMinimumCongestionWindow; |
} |
-void TcpCubicSender::RevertRetransmissionTimeout() { |
- if (previous_congestion_window_ == 0) { |
- LOG(DFATAL) << "No previous congestion window to revert to."; |
- return; |
- } |
- congestion_window_ = previous_congestion_window_; |
- slowstart_threshold_ = previous_slowstart_threshold_; |
- previous_congestion_window_ = 0; |
-} |
- |
CongestionControlType TcpCubicSender::GetCongestionControlType() const { |
return reno_ ? kReno : kCubic; |
} |