From d51cccd9a56de52d7859971163785cd9cf4af04e Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 7 Jul 2022 15:46:47 -0400 Subject: [PATCH] Revert "freebsd_network: Adjust callout_reset to drain not stop callouts." This reverts commit 259f9a76d8eb1c6156b544f3f91158e684b23d00. This does not work with callouts that reschedule themselves, which is something certain drivers indeed do. --- 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 3afe186778..303a98ebeb 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_drain(c); + int canceled = callout_stop(c); MutexLocker locker(sLock);