From 3eb6bdd89e49db7ca1b9b5827b8aa194ecfb2e60 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 15 May 2015 16:56:48 +0100 Subject: [PATCH] bond: move to drivers/net/ Move bonded ethdev pmd to drivers/net Signed-off-by: Bruce Richardson Acked-by: John McNamara Acked-by: Thomas Monjalon --- MAINTAINERS | 2 +- doc/api/doxy-api.conf | 2 +- doc/guides/prog_guide/source_org.rst | 2 +- drivers/net/Makefile | 1 + {lib/librte_pmd_bond => drivers/net/bonding}/Makefile | 0 {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond.h | 0 .../net/bonding}/rte_eth_bond_8023ad.c | 0 .../net/bonding}/rte_eth_bond_8023ad.h | 0 .../net/bonding}/rte_eth_bond_8023ad_private.h | 0 {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_alb.c | 0 {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_alb.h | 0 {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_api.c | 0 .../librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_args.c | 0 {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_pmd.c | 0 .../net/bonding}/rte_eth_bond_private.h | 0 .../net/bonding}/rte_eth_bond_version.map | 0 lib/Makefile | 1 - 17 files changed, 4 insertions(+), 4 deletions(-) rename {lib/librte_pmd_bond => drivers/net/bonding}/Makefile (100%) rename {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond.h (100%) rename {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_8023ad.c (100%) rename {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_8023ad.h (100%) rename {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_8023ad_private.h (100%) rename {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_alb.c (100%) rename {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_alb.h (100%) rename {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_api.c (100%) rename {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_args.c (100%) rename {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_pmd.c (100%) rename {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_private.h (100%) rename {lib/librte_pmd_bond => drivers/net/bonding}/rte_eth_bond_version.map (100%) diff --git a/MAINTAINERS b/MAINTAINERS index d39d09356a..4162aec053 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -192,7 +192,7 @@ Drivers Link bonding M: Declan Doherty -F: lib/librte_pmd_bond/ +F: drivers/net/bonding/ F: doc/guides/prog_guide/link_bonding_poll_mode_drv_lib.rst F: app/test/test_link_bonding* F: examples/bond/ diff --git a/doc/api/doxy-api.conf b/doc/api/doxy-api.conf index 51b11c7e59..de32af1aee 100644 --- a/doc/api/doxy-api.conf +++ b/doc/api/doxy-api.conf @@ -30,6 +30,7 @@ PROJECT_NAME = DPDK INPUT = doc/api/doxy-api-index.md \ + drivers/net/bonding \ lib/librte_eal/common/include \ lib/librte_eal/common/include/generic \ lib/librte_acl \ @@ -50,7 +51,6 @@ INPUT = doc/api/doxy-api-index.md \ lib/librte_pipeline \ lib/librte_port \ lib/librte_power \ - lib/librte_pmd_bond \ lib/librte_reorder \ lib/librte_ring \ lib/librte_sched \ diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst index 5ca9745b39..c0bf70edd6 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_bond # bonding poll mode driver +-- librte_pmd_e1000 # 1GbE poll mode drivers (igb and em) +-- librte_pmd_fm10k # Host interface PMD driver for FM10000 Series +-- librte_pmd_ixgbe # 10GbE poll mode driver @@ -107,6 +106,7 @@ The drivers directory has a net subdirectory which contains:: drivers/net +-- af_packet # poll mode driver based on linux af_packet + +-- bonding # bonding poll mode driver Applications ------------ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index bbd4139024..4b2568b78b 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -32,6 +32,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += af_packet +DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bonding include $(RTE_SDK)/mk/rte.sharelib.mk include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_pmd_bond/Makefile b/drivers/net/bonding/Makefile similarity index 100% rename from lib/librte_pmd_bond/Makefile rename to drivers/net/bonding/Makefile diff --git a/lib/librte_pmd_bond/rte_eth_bond.h b/drivers/net/bonding/rte_eth_bond.h similarity index 100% rename from lib/librte_pmd_bond/rte_eth_bond.h rename to drivers/net/bonding/rte_eth_bond.h diff --git a/lib/librte_pmd_bond/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c similarity index 100% rename from lib/librte_pmd_bond/rte_eth_bond_8023ad.c rename to drivers/net/bonding/rte_eth_bond_8023ad.c diff --git a/lib/librte_pmd_bond/rte_eth_bond_8023ad.h b/drivers/net/bonding/rte_eth_bond_8023ad.h similarity index 100% rename from lib/librte_pmd_bond/rte_eth_bond_8023ad.h rename to drivers/net/bonding/rte_eth_bond_8023ad.h diff --git a/lib/librte_pmd_bond/rte_eth_bond_8023ad_private.h b/drivers/net/bonding/rte_eth_bond_8023ad_private.h similarity index 100% rename from lib/librte_pmd_bond/rte_eth_bond_8023ad_private.h rename to drivers/net/bonding/rte_eth_bond_8023ad_private.h diff --git a/lib/librte_pmd_bond/rte_eth_bond_alb.c b/drivers/net/bonding/rte_eth_bond_alb.c similarity index 100% rename from lib/librte_pmd_bond/rte_eth_bond_alb.c rename to drivers/net/bonding/rte_eth_bond_alb.c diff --git a/lib/librte_pmd_bond/rte_eth_bond_alb.h b/drivers/net/bonding/rte_eth_bond_alb.h similarity index 100% rename from lib/librte_pmd_bond/rte_eth_bond_alb.h rename to drivers/net/bonding/rte_eth_bond_alb.h diff --git a/lib/librte_pmd_bond/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c similarity index 100% rename from lib/librte_pmd_bond/rte_eth_bond_api.c rename to drivers/net/bonding/rte_eth_bond_api.c diff --git a/lib/librte_pmd_bond/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c similarity index 100% rename from lib/librte_pmd_bond/rte_eth_bond_args.c rename to drivers/net/bonding/rte_eth_bond_args.c diff --git a/lib/librte_pmd_bond/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c similarity index 100% rename from lib/librte_pmd_bond/rte_eth_bond_pmd.c rename to drivers/net/bonding/rte_eth_bond_pmd.c diff --git a/lib/librte_pmd_bond/rte_eth_bond_private.h b/drivers/net/bonding/rte_eth_bond_private.h similarity index 100% rename from lib/librte_pmd_bond/rte_eth_bond_private.h rename to drivers/net/bonding/rte_eth_bond_private.h diff --git a/lib/librte_pmd_bond/rte_eth_bond_version.map b/drivers/net/bonding/rte_eth_bond_version.map similarity index 100% rename from lib/librte_pmd_bond/rte_eth_bond_version.map rename to drivers/net/bonding/rte_eth_bond_version.map diff --git a/lib/Makefile b/lib/Makefile index 782f84af8b..889a20d86c 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -47,7 +47,6 @@ 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_ENIC_PMD) += librte_pmd_enic -DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += librte_pmd_bond 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 -- 2.20.1