From f484ffa1b15a71568a61a0ff8b722622ceac76a6 Mon Sep 17 00:00:00 2001 From: Ophir Munk Date: Wed, 10 Jun 2020 09:32:28 +0000 Subject: [PATCH] net/mlx5: move socket files in Linux directory mlx5_socket.c file is using APIs which are Linux specifics. Therefore move it (including mlx5_socket.h) from net/mlx5 directory to net/mlx5/linux directory. This commit also updates the Makefile and the meson files. Signed-off-by: Ophir Munk --- drivers/net/mlx5/Makefile | 2 +- drivers/net/mlx5/linux/meson.build | 1 + drivers/net/mlx5/{ => linux}/mlx5_socket.c | 0 drivers/net/mlx5/meson.build | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) rename drivers/net/mlx5/{ => linux}/mlx5_socket.c (100%) diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 41ab73e5c9..84fc9cca05 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -31,7 +31,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_dv.c SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_verbs.c SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mp.c SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_utils.c -SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_socket.c +SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_socket.c SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_os.c # Basic CFLAGS. diff --git a/drivers/net/mlx5/linux/meson.build b/drivers/net/mlx5/linux/meson.build index 2ea0792a40..f8369ccd67 100644 --- a/drivers/net/mlx5/linux/meson.build +++ b/drivers/net/mlx5/linux/meson.build @@ -3,6 +3,7 @@ includes += include_directories('.') sources += files( + 'mlx5_socket.c', 'mlx5_os.c', ) diff --git a/drivers/net/mlx5/mlx5_socket.c b/drivers/net/mlx5/linux/mlx5_socket.c similarity index 100% rename from drivers/net/mlx5/mlx5_socket.c rename to drivers/net/mlx5/linux/mlx5_socket.c diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index e71b2c515a..e95ce02679 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -28,7 +28,6 @@ sources = files( 'mlx5_txq.c', 'mlx5_vlan.c', 'mlx5_utils.c', - 'mlx5_socket.c', ) if (dpdk_conf.has('RTE_ARCH_X86_64') or dpdk_conf.has('RTE_ARCH_ARM64') -- 2.20.1