diff --git a/MAINTAINERS b/MAINTAINERS index 0d96a5eacb..e486328704 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -232,7 +232,7 @@ F: doc/guides/nics/intel_vf.rst Intel fm10k M: Jing Chen -F: lib/librte_pmd_fm10k/ +F: drivers/net/fm10k/ Mellanox mlx4 M: Adrien Mazarguil diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst index 3c3a15a4d4..4fb4bb745f 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_fm10k # Host interface PMD driver for FM10000 Series +-- librte_pmd_ixgbe # 10GbE poll mode driver +-- librte_pmd_i40e # 40GbE poll mode driver +-- librte_pmd_mlx4 # Mellanox ConnectX-3 poll mode driver @@ -108,6 +107,7 @@ The drivers directory has a net subdirectory which contains:: +-- bonding # bonding poll mode driver +-- e1000 # 1GbE poll mode drivers (igb and em) +-- enic # Cisco VIC Ethernet NIC Poll-mode Driver + +-- fm10k # Host interface PMD driver for FM10000 Series Applications ------------ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index faf0706926..b440c0e916 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -35,6 +35,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += af_packet DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bonding DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000 DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic +DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k include $(RTE_SDK)/mk/rte.sharelib.mk include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_pmd_fm10k/Makefile b/drivers/net/fm10k/Makefile similarity index 100% rename from lib/librte_pmd_fm10k/Makefile rename to drivers/net/fm10k/Makefile diff --git a/lib/librte_pmd_fm10k/base/fm10k_api.c b/drivers/net/fm10k/base/fm10k_api.c similarity index 100% rename from lib/librte_pmd_fm10k/base/fm10k_api.c rename to drivers/net/fm10k/base/fm10k_api.c diff --git a/lib/librte_pmd_fm10k/base/fm10k_api.h b/drivers/net/fm10k/base/fm10k_api.h similarity index 100% rename from lib/librte_pmd_fm10k/base/fm10k_api.h rename to drivers/net/fm10k/base/fm10k_api.h diff --git a/lib/librte_pmd_fm10k/base/fm10k_common.c b/drivers/net/fm10k/base/fm10k_common.c similarity index 100% rename from lib/librte_pmd_fm10k/base/fm10k_common.c rename to drivers/net/fm10k/base/fm10k_common.c diff --git a/lib/librte_pmd_fm10k/base/fm10k_common.h b/drivers/net/fm10k/base/fm10k_common.h similarity index 100% rename from lib/librte_pmd_fm10k/base/fm10k_common.h rename to drivers/net/fm10k/base/fm10k_common.h diff --git a/lib/librte_pmd_fm10k/base/fm10k_mbx.c b/drivers/net/fm10k/base/fm10k_mbx.c similarity index 100% rename from lib/librte_pmd_fm10k/base/fm10k_mbx.c rename to drivers/net/fm10k/base/fm10k_mbx.c diff --git a/lib/librte_pmd_fm10k/base/fm10k_mbx.h b/drivers/net/fm10k/base/fm10k_mbx.h similarity index 100% rename from lib/librte_pmd_fm10k/base/fm10k_mbx.h rename to drivers/net/fm10k/base/fm10k_mbx.h diff --git a/lib/librte_pmd_fm10k/base/fm10k_osdep.h b/drivers/net/fm10k/base/fm10k_osdep.h similarity index 100% rename from lib/librte_pmd_fm10k/base/fm10k_osdep.h rename to drivers/net/fm10k/base/fm10k_osdep.h diff --git a/lib/librte_pmd_fm10k/base/fm10k_pf.c b/drivers/net/fm10k/base/fm10k_pf.c similarity index 100% rename from lib/librte_pmd_fm10k/base/fm10k_pf.c rename to drivers/net/fm10k/base/fm10k_pf.c diff --git a/lib/librte_pmd_fm10k/base/fm10k_pf.h b/drivers/net/fm10k/base/fm10k_pf.h similarity index 100% rename from lib/librte_pmd_fm10k/base/fm10k_pf.h rename to drivers/net/fm10k/base/fm10k_pf.h diff --git a/lib/librte_pmd_fm10k/base/fm10k_tlv.c b/drivers/net/fm10k/base/fm10k_tlv.c similarity index 100% rename from lib/librte_pmd_fm10k/base/fm10k_tlv.c rename to drivers/net/fm10k/base/fm10k_tlv.c diff --git a/lib/librte_pmd_fm10k/base/fm10k_tlv.h b/drivers/net/fm10k/base/fm10k_tlv.h similarity index 100% rename from lib/librte_pmd_fm10k/base/fm10k_tlv.h rename to drivers/net/fm10k/base/fm10k_tlv.h diff --git a/lib/librte_pmd_fm10k/base/fm10k_type.h b/drivers/net/fm10k/base/fm10k_type.h similarity index 100% rename from lib/librte_pmd_fm10k/base/fm10k_type.h rename to drivers/net/fm10k/base/fm10k_type.h diff --git a/lib/librte_pmd_fm10k/base/fm10k_vf.c b/drivers/net/fm10k/base/fm10k_vf.c similarity index 100% rename from lib/librte_pmd_fm10k/base/fm10k_vf.c rename to drivers/net/fm10k/base/fm10k_vf.c diff --git a/lib/librte_pmd_fm10k/base/fm10k_vf.h b/drivers/net/fm10k/base/fm10k_vf.h similarity index 100% rename from lib/librte_pmd_fm10k/base/fm10k_vf.h rename to drivers/net/fm10k/base/fm10k_vf.h diff --git a/lib/librte_pmd_fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h similarity index 100% rename from lib/librte_pmd_fm10k/fm10k.h rename to drivers/net/fm10k/fm10k.h diff --git a/lib/librte_pmd_fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c similarity index 100% rename from lib/librte_pmd_fm10k/fm10k_ethdev.c rename to drivers/net/fm10k/fm10k_ethdev.c diff --git a/lib/librte_pmd_fm10k/fm10k_logs.h b/drivers/net/fm10k/fm10k_logs.h similarity index 100% rename from lib/librte_pmd_fm10k/fm10k_logs.h rename to drivers/net/fm10k/fm10k_logs.h diff --git a/lib/librte_pmd_fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c similarity index 100% rename from lib/librte_pmd_fm10k/fm10k_rxtx.c rename to drivers/net/fm10k/fm10k_rxtx.c diff --git a/lib/librte_pmd_fm10k/rte_pmd_fm10k_version.map b/drivers/net/fm10k/rte_pmd_fm10k_version.map similarity index 100% rename from lib/librte_pmd_fm10k/rte_pmd_fm10k_version.map rename to drivers/net/fm10k/rte_pmd_fm10k_version.map diff --git a/lib/Makefile b/lib/Makefile index ca4238d177..73a0e09d7b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -43,7 +43,6 @@ DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ether DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += librte_pmd_ixgbe DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += librte_pmd_i40e -DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += librte_pmd_fm10k 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