From 259f9a76d8eb1c6156b544f3f91158e684b23d00 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 7 Jul 2022 14:58:02 -0400 Subject: [PATCH] freebsd_network: Adjust callout_reset to drain not stop callouts. As we are going to modify func/arg, we need to be sure they are not even executing. --- src/libs/compat/freebsd_network/callout.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/compat/freebsd_network/callout.cpp b/src/libs/compat/freebsd_network/callout.cpp index 303a98ebeb..3afe186778 100644 --- a/src/libs/compat/freebsd_network/callout.cpp +++ b/src/libs/compat/freebsd_network/callout.cpp @@ -176,7 +176,7 @@ callout_init_mtx(struct callout *c, struct mtx *mtx, int flags) int callout_reset(struct callout *c, int _ticks, void (*func)(void *), void *arg) { - int canceled = callout_stop(c); + int canceled = callout_drain(c); MutexLocker locker(sLock);