git: 2787f8c39c60 - main - mlx5en: stop including mlx5_accel/ipsec.h from en.h
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 20 Aug 2024 12:43:44 UTC
The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2787f8c39c60f7510f9bc04ec46fe0b37ece0e3e commit 2787f8c39c60f7510f9bc04ec46fe0b37ece0e3e Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2024-07-31 22:13:33 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2024-08-20 12:42:12 +0000 mlx5en: stop including mlx5_accel/ipsec.h from en.h This creates a circular dependency preventing inline functions from ipsec.h from using en.h definitions. Sponsored by: NVidia networking --- sys/dev/mlx5/mlx5_en/en.h | 1 - sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c | 1 + sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_en/en.h b/sys/dev/mlx5/mlx5_en/en.h index cdc8caa838d6..8966aeacb890 100644 --- a/sys/dev/mlx5/mlx5_en/en.h +++ b/sys/dev/mlx5/mlx5_en/en.h @@ -70,7 +70,6 @@ #include <dev/mlx5/mlx5_core/wq.h> #include <dev/mlx5/mlx5_core/transobj.h> #include <dev/mlx5/mlx5_core/mlx5_core.h> -#include <dev/mlx5/mlx5_accel/ipsec.h> #define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c b/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c index 1601557e52cc..ac275b5b145c 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c @@ -27,6 +27,7 @@ #include "opt_ratelimit.h" #include <dev/mlx5/mlx5_en/en.h> +#include <dev/mlx5/mlx5_accel/ipsec.h> #include <linux/list.h> #include <dev/mlx5/fs.h> diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index a80235f0f347..acb9f72b15c3 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -30,6 +30,7 @@ #include "opt_ratelimit.h" #include <dev/mlx5/mlx5_en/en.h> +#include <dev/mlx5/mlx5_accel/ipsec.h> #include <sys/eventhandler.h> #include <sys/sockio.h>