git: b328b79f6f2b - stable/14 - mlx5en: Fix domain set usage in TLS tag import functions
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 11 Mar 2025 00:59:48 UTC
The branch stable/14 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=b328b79f6f2ba4cfe2704430e43cf7eccb4738a2
commit b328b79f6f2ba4cfe2704430e43cf7eccb4738a2
Author: Slava Shwartsman <slavash@nvidia.com>
AuthorDate: 2025-02-24 18:08:58 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2025-03-11 00:59:11 +0000
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 af280abcdcd2..a5d485597c77 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 19c6adf18809..f584e5228657 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;