From 232771c793dd8e1c4401975b6ad558604d20286a Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 15 May 2015 16:56:56 +0100 Subject: [PATCH] pcap: move drivers/net/ Move pcap 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_pcap => drivers/net/pcap}/Makefile | 0 {lib/librte_pmd_pcap => drivers/net/pcap}/rte_eth_pcap.c | 0 .../net/pcap}/rte_pmd_pcap_version.map | 0 lib/Makefile | 1 - lib/librte_eal/bsdapp/eal/Makefile | 4 ++-- lib/librte_eal/linuxapp/eal/Makefile | 2 +- 9 files changed, 6 insertions(+), 6 deletions(-) rename {lib/librte_pmd_pcap => drivers/net/pcap}/Makefile (100%) rename {lib/librte_pmd_pcap => drivers/net/pcap}/rte_eth_pcap.c (100%) rename {lib/librte_pmd_pcap => drivers/net/pcap}/rte_pmd_pcap_version.map (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 81d5fee75e..64ccca54d8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -256,7 +256,7 @@ F: doc/guides/nics/vmxnet3.rst PCAP PMD M: Nicolás Pernas Maradei M: John McNamara -F: lib/librte_pmd_pcap/ +F: drivers/net/pcap/ F: doc/guides/nics/pcap_ring.rst Ring PMD diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst index 418e21cbba..f4632348bc 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_pcap # PCAP poll mode driver +-- librte_pmd_ring # ring poll mode driver +-- librte_pmd_virtio # virtio poll mode driver +-- librte_pmd_vmxnet3 # VMXNET3 poll mode driver @@ -109,6 +108,7 @@ The drivers directory has a net subdirectory which contains:: +-- ixgbe # 10GbE poll mode driver +-- mlx4 # Mellanox ConnectX-3 poll mode driver +-- null # NULL poll mode driver for testing + +-- pcap # PCAP poll mode driver Applications ------------ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 5da94386aa..29c936125f 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -40,6 +40,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4 DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += null +DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += pcap include $(RTE_SDK)/mk/rte.sharelib.mk include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_pmd_pcap/Makefile b/drivers/net/pcap/Makefile similarity index 100% rename from lib/librte_pmd_pcap/Makefile rename to drivers/net/pcap/Makefile diff --git a/lib/librte_pmd_pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c similarity index 100% rename from lib/librte_pmd_pcap/rte_eth_pcap.c rename to drivers/net/pcap/rte_eth_pcap.c diff --git a/lib/librte_pmd_pcap/rte_pmd_pcap_version.map b/drivers/net/pcap/rte_pmd_pcap_version.map similarity index 100% rename from lib/librte_pmd_pcap/rte_pmd_pcap_version.map rename to drivers/net/pcap/rte_pmd_pcap_version.map diff --git a/lib/Makefile b/lib/Makefile index d4533dcf67..e63f1fe2b4 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -42,7 +42,6 @@ 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_PMD_RING) += librte_pmd_ring -DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += librte_pmd_pcap DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += librte_pmd_virtio DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += librte_pmd_vmxnet3 DIRS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += librte_pmd_xenvirt diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile index 2357cfac8a..c2fe933b19 100644 --- a/lib/librte_eal/bsdapp/eal/Makefile +++ b/lib/librte_eal/bsdapp/eal/Makefile @@ -1,6 +1,6 @@ # BSD LICENSE # -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. +# Copyright(c) 2010-2015 Intel Corporation. All rights reserved. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -43,7 +43,7 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_mempool CFLAGS += -I$(RTE_SDK)/lib/librte_malloc CFLAGS += -I$(RTE_SDK)/lib/librte_ether CFLAGS += -I$(RTE_SDK)/lib/librte_pmd_ring -CFLAGS += -I$(RTE_SDK)/lib/librte_pmd_pcap +CFLAGS += -I$(RTE_SDK)/drivers/net/pcap CFLAGS += $(WERROR_FLAGS) -O3 EXPORT_MAP := rte_eal_version.map diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile index 7d3cf66509..fdb365650f 100644 --- a/lib/librte_eal/linuxapp/eal/Makefile +++ b/lib/librte_eal/linuxapp/eal/Makefile @@ -48,7 +48,7 @@ CFLAGS += -I$(RTE_SDK)/lib/librte_malloc CFLAGS += -I$(RTE_SDK)/lib/librte_ether CFLAGS += -I$(RTE_SDK)/lib/librte_ivshmem CFLAGS += -I$(RTE_SDK)/lib/librte_pmd_ring -CFLAGS += -I$(RTE_SDK)/lib/librte_pmd_pcap +CFLAGS += -I$(RTE_SDK)/drivers/net/pcap CFLAGS += -I$(RTE_SDK)/drivers/net/af_packet CFLAGS += -I$(RTE_SDK)/lib/librte_pmd_xenvirt CFLAGS += $(WERROR_FLAGS) -O3 -- 2.20.1