summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2015-05-15 16:56:47 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2015-05-22 15:51:38 +0200
commitdf65e967a8756c5c2f6aa1333c6b6e55e47c4681 (patch)
treedc285e94d496ba177954be18812a9a91d286d5ba
parent980ed498eb1dd0dc671e6796cbc9d3138250d0d9 (diff)
downloaddpdk-df65e967a8756c5c2f6aa1333c6b6e55e47c4681.zip
dpdk-df65e967a8756c5c2f6aa1333c6b6e55e47c4681.tar.gz
dpdk-df65e967a8756c5c2f6aa1333c6b6e55e47c4681.tar.xz
af_packet: move to drivers/net/
move af_packet pmd to drivers/net directory Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: John McNamara <john.mcnamara@intel.com> Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
-rw-r--r--MAINTAINERS2
-rw-r--r--doc/guides/prog_guide/source_org.rst1
-rw-r--r--drivers/net/Makefile1
-rw-r--r--drivers/net/af_packet/Makefile (renamed from lib/librte_pmd_af_packet/Makefile)0
-rw-r--r--drivers/net/af_packet/rte_eth_af_packet.c (renamed from lib/librte_pmd_af_packet/rte_eth_af_packet.c)0
-rw-r--r--drivers/net/af_packet/rte_eth_af_packet.h (renamed from lib/librte_pmd_af_packet/rte_eth_af_packet.h)0
-rw-r--r--drivers/net/af_packet/rte_pmd_af_packet_version.map (renamed from lib/librte_pmd_af_packet/rte_pmd_af_packet_version.map)0
-rw-r--r--lib/Makefile3
-rw-r--r--lib/librte_eal/linuxapp/eal/Makefile4
9 files changed, 6 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0477e7d..d39d093 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -208,7 +208,7 @@ F: doc/guides/sample_app_ug/kernel_nic_interface.rst
Linux AF_PACKET
M: John W. Linville <linville@tuxdriver.com>
-F: lib/librte_pmd_af_packet/
+F: drivers/net/af_packet/
Cisco enic
F: lib/librte_pmd_enic/
diff --git a/doc/guides/prog_guide/source_org.rst b/doc/guides/prog_guide/source_org.rst
index 269a0bc..5ca9745 100644
--- a/doc/guides/prog_guide/source_org.rst
+++ b/doc/guides/prog_guide/source_org.rst
@@ -106,6 +106,7 @@ library with the format "librte_pmd_X.a" where "X" is the driver name.
The drivers directory has a net subdirectory which contains::
drivers/net
+ +-- af_packet # poll mode driver based on linux af_packet
Applications
------------
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 600a55a..bbd4139 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -31,6 +31,7 @@
include $(RTE_SDK)/mk/rte.vars.mk
+DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += af_packet
include $(RTE_SDK)/mk/rte.sharelib.mk
include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/lib/librte_pmd_af_packet/Makefile b/drivers/net/af_packet/Makefile
index f0bf537..f0bf537 100644
--- a/lib/librte_pmd_af_packet/Makefile
+++ b/drivers/net/af_packet/Makefile
diff --git a/lib/librte_pmd_af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index bdd9628..bdd9628 100644
--- a/lib/librte_pmd_af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
diff --git a/lib/librte_pmd_af_packet/rte_eth_af_packet.h b/drivers/net/af_packet/rte_eth_af_packet.h
index 5d1bc7e..5d1bc7e 100644
--- a/lib/librte_pmd_af_packet/rte_eth_af_packet.h
+++ b/drivers/net/af_packet/rte_eth_af_packet.h
diff --git a/lib/librte_pmd_af_packet/rte_pmd_af_packet_version.map b/drivers/net/af_packet/rte_pmd_af_packet_version.map
index de95169..de95169 100644
--- a/lib/librte_pmd_af_packet/rte_pmd_af_packet_version.map
+++ b/drivers/net/af_packet/rte_pmd_af_packet_version.map
diff --git a/lib/Makefile b/lib/Makefile
index d94355d..782f84a 100644
--- a/lib/Makefile
+++ b/lib/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
@@ -50,7 +50,6 @@ 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_PMD_AF_PACKET) += librte_pmd_af_packet
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/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile
index 01f7b70..7d3cf66 100644
--- a/lib/librte_eal/linuxapp/eal/Makefile
+++ b/lib/librte_eal/linuxapp/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
@@ -49,7 +49,7 @@ 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)/lib/librte_pmd_af_packet
+CFLAGS += -I$(RTE_SDK)/drivers/net/af_packet
CFLAGS += -I$(RTE_SDK)/lib/librte_pmd_xenvirt
CFLAGS += $(WERROR_FLAGS) -O3