Deprecate --gfe2_reloadable_flag_quic_bbr2_disable_reno_coexistence. PiperOrigin-RevId: 357756987 Change-Id: Id6757ccfba485ccce1634b711893badd4fdc9672
diff --git a/quic/core/congestion_control/bbr2_sender.cc b/quic/core/congestion_control/bbr2_sender.cc index e8ef762..a29d7ae 100644 --- a/quic/core/congestion_control/bbr2_sender.cc +++ b/quic/core/congestion_control/bbr2_sender.cc
@@ -151,9 +151,7 @@ QUIC_RELOADABLE_FLAG_COUNT(quic_bbr2_use_bytes_delivered); params_.use_bytes_delivered_for_inflight_hi = true; } - if (GetQuicReloadableFlag(quic_bbr2_disable_reno_coexistence) && - ContainsQuicTag(connection_options, kB2RC)) { - QUIC_RELOADABLE_FLAG_COUNT(quic_bbr2_disable_reno_coexistence); + if (ContainsQuicTag(connection_options, kB2RC)) { params_.enable_reno_coexistence = false; } if (ContainsQuicTag(connection_options, kBSAO)) {
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h index bdf5853..7b6bd95 100644 --- a/quic/core/quic_flags_list.h +++ b/quic/core/quic_flags_list.h
@@ -12,7 +12,6 @@ QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_allow_client_enabled_bbr_v2, false) QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_avoid_too_low_probe_bw_cwnd, false) QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_bw_startup, true) -QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_disable_reno_coexistence, true) QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_fewer_startup_round_trips, true) QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_reset_max_bytes_delivered, true) QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_use_bytes_delivered, true)