From 23b8eef05b2c2ab692f0636fc30773296f951385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20L=C3=A9caille?= Date: Fri, 31 Mar 2023 20:18:44 +0200 Subject: [PATCH] BUG/MINOR: quic: Remaining useless statements in cubic slow start callback When entering a recovery period, the algo state is set by quic_enter_recovery(). And that's it!. These two lines should have been removed with this commit: BUG/MINOR: quic: Wrong use of now_ms timestamps (cubic algo) Take the opportunity of this patch to add a missing TRACE_LEAVE() call in quic_cc_cubic_ca_cb(). Must be backported to 2.7 and 2.6. --- src/quic_cc_cubic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/quic_cc_cubic.c b/src/quic_cc_cubic.c index 6e829dd2d..d60d3ed69 100644 --- a/src/quic_cc_cubic.c +++ b/src/quic_cc_cubic.c @@ -211,8 +211,6 @@ static void quic_cc_cubic_ss_cb(struct quic_cc *cc, struct quic_cc_event *ev) case QUIC_CC_EVT_LOSS: quic_enter_recovery(cc); - /* Exit to congestion avoidance. */ - cc->algo->state = QUIC_CC_ST_CA; break; case QUIC_CC_EVT_ECN_CE: @@ -244,6 +242,7 @@ static void quic_cc_cubic_ca_cb(struct quic_cc *cc, struct quic_cc_event *ev) out: TRACE_PROTO("CC cubic", QUIC_EV_CONN_CC, cc->qc, NULL, cc); + TRACE_LEAVE(QUIC_EV_CONN_CC, cc->qc); } /* Recovery period callback */