From b328b79f6f2ba4cfe2704430e43cf7eccb4738a2 Mon Sep 17 00:00:00 2001 From: Slava Shwartsman Date: Mon, 24 Feb 2025 20:08:58 +0200 Subject: [PATCH] mlx5en: Fix domain set usage in TLS tag import functions (cherry picked from commit 85af37e15958bd050093e6368afe6afe8e7a5ced) --- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c | 2 +- sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c index af280abcdcd..a5d485597c7 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c @@ -117,7 +117,7 @@ mlx5e_tls_tag_import(void *arg, void **store, int cnt, int domain, int flags) for (i = 0; i != cnt; i++) { ptag = malloc_domainset(sizeof(*ptag), M_MLX5E_TLS, - mlx5_dev_domainset(arg), flags | M_ZERO); + mlx5_dev_domainset(priv->mdev), flags | M_ZERO); if (ptag == NULL) return (i); ptag->tls = &priv->tls; diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c index 19c6adf1880..f584e522865 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c @@ -387,11 +387,12 @@ static int mlx5e_tls_rx_tag_import(void *arg, void **store, int cnt, int domain, int flags) { struct mlx5e_tls_rx_tag *ptag; + struct mlx5_core_dev *mdev = arg; int i; for (i = 0; i != cnt; i++) { ptag = malloc_domainset(sizeof(*ptag), M_MLX5E_TLS_RX, - mlx5_dev_domainset(arg), flags | M_ZERO); + mlx5_dev_domainset(mdev), flags | M_ZERO); mtx_init(&ptag->mtx, "mlx5-tls-rx-tag-mtx", NULL, MTX_DEF); INIT_WORK(&ptag->work, mlx5e_tls_rx_work); store[i] = ptag;