From 98a1f3776fc9a3de442aee4136adbd6cf3a63f15 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 15 May 2015 16:56:54 +0100 Subject: [PATCH] mlx4: move to drivers/net/ move mlx4 PMD to drivers/net directory Signed-off-by: Bruce Richardson Acked-by: John McNamara Acked-by: Thomas Monjalon --- MAINTAINERS | 2 +- doc/guides/prog_guide/source_org.rst | 2 +- drivers/net/Makefile | 1 + {lib/librte_pmd_mlx4 => drivers/net/mlx4}/Makefile | 0 {lib/librte_pmd_mlx4 => drivers/net/mlx4}/mlx4.c | 0 {lib/librte_pmd_mlx4 => drivers/net/mlx4}/mlx4.h | 0 .../net/mlx4}/rte_pmd_mlx4_version.map | 0 lib/Makefile | 1 - 8 files changed, 3 insertions(+), 3 deletions(-) rename {lib/librte_pmd_mlx4 => drivers/net/mlx4}/Makefile (100%) rename {lib/librte_pmd_mlx4 => drivers/net/mlx4}/mlx4.c (100%) rename {lib/librte_pmd_mlx4 => drivers/net/mlx4}/mlx4.h (100%) rename {lib/librte_pmd_mlx4 => drivers/net/mlx4}/rte_pmd_mlx4_version.map (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 767eab5028..04f61e4153 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -236,7 +236,7 @@ F: drivers/net/fm10k/ Mellanox mlx4 M: Adrien Mazarguil -F: lib/librte_pmd_mlx4/ +F: drivers/net/mlx4/ F: doc/guides/nics/mlx4.rst RedHat virtio diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst index 8e3f4ee159..0ac517ba6a 100644 --- a/doc/guides/prog_guide/source_org.rst +++ b/doc/guides/prog_guide/source_org.rst @@ -79,7 +79,6 @@ The lib directory contains:: +-- librte_mempool # memory pool manager (fixedsized objects) +-- librte_meter # QoS metering library +-- librte_net # various IP-related headers - +-- librte_pmd_mlx4 # Mellanox ConnectX-3 poll mode driver +-- librte_pmd_pcap # PCAP poll mode driver +-- librte_pmd_ring # ring poll mode driver +-- librte_pmd_virtio # virtio poll mode driver @@ -108,6 +107,7 @@ The drivers directory has a net subdirectory which contains:: +-- fm10k # Host interface PMD driver for FM10000 Series +-- i40e # 40GbE poll mode driver +-- ixgbe # 10GbE poll mode driver + +-- mlx4 # Mellanox ConnectX-3 poll mode driver Applications ------------ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 156a16fabb..45e06a6b59 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -38,6 +38,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe +DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4 include $(RTE_SDK)/mk/rte.sharelib.mk include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_pmd_mlx4/Makefile b/drivers/net/mlx4/Makefile similarity index 100% rename from lib/librte_pmd_mlx4/Makefile rename to drivers/net/mlx4/Makefile diff --git a/lib/librte_pmd_mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c similarity index 100% rename from lib/librte_pmd_mlx4/mlx4.c rename to drivers/net/mlx4/mlx4.c diff --git a/lib/librte_pmd_mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h similarity index 100% rename from lib/librte_pmd_mlx4/mlx4.h rename to drivers/net/mlx4/mlx4.h diff --git a/lib/librte_pmd_mlx4/rte_pmd_mlx4_version.map b/drivers/net/mlx4/rte_pmd_mlx4_version.map similarity index 100% rename from lib/librte_pmd_mlx4/rte_pmd_mlx4_version.map rename to drivers/net/mlx4/rte_pmd_mlx4_version.map diff --git a/lib/Makefile b/lib/Makefile index ffd7870f55..80978cd8f0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -41,7 +41,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += librte_timer DIRS-$(CONFIG_RTE_LIBRTE_CFGFILE) += librte_cfgfile DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ether -DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += librte_pmd_mlx4 DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += librte_pmd_ring DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += librte_pmd_pcap DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += librte_pmd_virtio