From a2c155ed9bc3ffd1531c8681460a73411a03c93f Mon Sep 17 00:00:00 2001 From: vmaffione Date: Wed, 28 Oct 2020 21:06:17 +0000 Subject: [PATCH] iflib: fix typo bug introduced by r367093 Code was supposed to call callout_reset_sbt_on() rather than callout_reset_sbt(). This resulted into passing a "cpu" value to a "flag" argument. A recipe for subtle errors. PR: 248652 Reported by: sg@efficientip.com MFC with: r367093 --- sys/net/iflib.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index c336a0a48cd..7798225f702 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -1066,9 +1066,10 @@ iflib_netmap_txsync(struct netmap_kring *kring, int flags) if (!(ctx->ifc_flags & IFC_NETMAP_TX_IRQ)) if (kring->nr_hwtail != nm_prev(kring->nr_hwcur, lim)) { - callout_reset_sbt(&txq->ift_netmap_timer, + callout_reset_sbt_on(&txq->ift_netmap_timer, NETMAP_TX_TIMER_US * SBT_1US, SBT_1US, - iflib_netmap_timer, txq, txq->ift_netmap_timer.c_cpu); + iflib_netmap_timer, txq, + txq->ift_netmap_timer.c_cpu, 0); } return (0); } -- 2.45.0