git: 0eb2dcd32ea6 - main - mlx5_en: fix use of CALLOUT_DIRECT

The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=0eb2dcd32ea6fb59661d709872e02ea6b3e7b9e2

commit 0eb2dcd32ea6fb59661d709872e02ea6b3e7b9e2
Author:     Konstantin Belousov <konstantinb@nvidia.com>
AuthorDate: 2021-09-08 15:37:20 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2021-10-05 10:07:36 +0000

    mlx5_en: fix use of CALLOUT_DIRECT
    
    Reported by:    markj
    Reviewed by:    hselasky
    Sponsored by:   NVIDIA Networking
    MFC after:      1 week
---
 sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
index 9d8854528d4a..bf8c3c52a343 100644
--- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
@@ -1126,10 +1126,10 @@ mlx5e_reset_calibration_callout(struct mlx5e_priv *priv)
 	if (priv->clbr_done == 0)
 		mlx5e_calibration_callout(priv);
 	else
-		callout_reset_curcpu(&priv->tstmp_clbr, (priv->clbr_done <
+		callout_reset_sbt_curcpu(&priv->tstmp_clbr, (priv->clbr_done <
 		    mlx5e_calibration_duration ? mlx5e_fast_calibration :
-		    mlx5e_normal_calibration) * hz, mlx5e_calibration_callout,
-		    priv);
+		    mlx5e_normal_calibration) * SBT_1S, 0,
+		    mlx5e_calibration_callout, priv, C_DIRECT_EXEC);
 }
 
 static uint64_t
@@ -4614,7 +4614,7 @@ mlx5e_create_ifp(struct mlx5_core_dev *mdev)
 	    OID_AUTO, "rx_clbr_done", CTLFLAG_RD,
 	    &priv->clbr_done, 0,
 	    "RX timestamps calibration state");
-	callout_init(&priv->tstmp_clbr, CALLOUT_DIRECT);
+	callout_init(&priv->tstmp_clbr, 1);
 	mlx5e_reset_calibration_callout(priv);
 
 	pa.pa_version = PFIL_VERSION;