summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-03-06 16:22:39 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-03-12 17:31:22 +0100
commit742bde12f3bd008c2f06d744330436d8b1a56720 (patch)
treeaf30fda2aa2cda1fb00e6b0740ba11f1e4ce6469 /drivers/net
parent91d7846ce68d7c637cd7efde751f5276475aa9c8 (diff)
downloaddpdk-742bde12f3bd008c2f06d744330436d8b1a56720.zip
dpdk-742bde12f3bd008c2f06d744330436d8b1a56720.tar.gz
dpdk-742bde12f3bd008c2f06d744330436d8b1a56720.tar.xz
build/linux: rename macro from LINUXAPP to LINUX
Rename the macro to make things shorter and more comprehensible. For both meson and make builds, keep the old macro around for backward compatibility. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ark/Makefile2
-rw-r--r--drivers/net/failsafe/Makefile2
-rw-r--r--drivers/net/pcap/rte_eth_pcap.c2
-rw-r--r--drivers/net/sfc/sfc_intr.c2
-rw-r--r--drivers/net/softnic/rte_eth_softnic_tap.c4
-rw-r--r--drivers/net/virtio/virtio_pci.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ark/Makefile b/drivers/net/ark/Makefile
index 2e232be..34d341c 100644
--- a/drivers/net/ark/Makefile
+++ b/drivers/net/ark/Makefile
@@ -31,7 +31,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_udm.c
# this lib depends upon:
LDLIBS += -lpthread
-ifdef CONFIG_RTE_EXEC_ENV_LINUXAPP
+ifdef CONFIG_RTE_EXEC_ENV_LINUX
LDLIBS += -ldl
endif
LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
diff --git a/drivers/net/failsafe/Makefile b/drivers/net/failsafe/Makefile
index 81802d0..0d840a2 100644
--- a/drivers/net/failsafe/Makefile
+++ b/drivers/net/failsafe/Makefile
@@ -20,7 +20,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_rxtx.c
SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_ether.c
SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_flow.c
SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_intr.c
-ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y)
+ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
CFLAGS += -DLINUX
else
CFLAGS += -DBSD
diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c
index 65bbd7e..518d9e3 100644
--- a/drivers/net/pcap/rte_eth_pcap.c
+++ b/drivers/net/pcap/rte_eth_pcap.c
@@ -979,7 +979,7 @@ static int
eth_pcap_update_mac(const char *if_name, struct rte_eth_dev *eth_dev,
const unsigned int numa_node)
{
-#if defined(RTE_EXEC_ENV_LINUXAPP)
+#if defined(RTE_EXEC_ENV_LINUX)
void *mac_addrs;
struct ifreq ifr;
int if_fd = socket(AF_INET, SOCK_DGRAM, 0);
diff --git a/drivers/net/sfc/sfc_intr.c b/drivers/net/sfc/sfc_intr.c
index fbdc7ee..0fbcd61 100644
--- a/drivers/net/sfc/sfc_intr.c
+++ b/drivers/net/sfc/sfc_intr.c
@@ -292,7 +292,7 @@ sfc_intr_attach(struct sfc_adapter *sa)
sfc_log_init(sa, "entry");
switch (pci_dev->intr_handle.type) {
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
case RTE_INTR_HANDLE_UIO_INTX:
case RTE_INTR_HANDLE_VFIO_LEGACY:
intr->type = EFX_INTR_LINE;
diff --git a/drivers/net/softnic/rte_eth_softnic_tap.c b/drivers/net/softnic/rte_eth_softnic_tap.c
index bcc23a9..0cac876 100644
--- a/drivers/net/softnic/rte_eth_softnic_tap.c
+++ b/drivers/net/softnic/rte_eth_softnic_tap.c
@@ -3,7 +3,7 @@
*/
#include <netinet/in.h>
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
#include <linux/if.h>
#include <linux/if_tun.h>
#endif
@@ -60,7 +60,7 @@ softnic_tap_find(struct pmd_internals *p,
return NULL;
}
-#ifndef RTE_EXEC_ENV_LINUXAPP
+#ifndef RTE_EXEC_ENV_LINUX
struct softnic_tap *
softnic_tap_create(struct pmd_internals *p __rte_unused,
diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index c8883c3..adc02f9 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -3,7 +3,7 @@
*/
#include <stdint.h>
-#ifdef RTE_EXEC_ENV_LINUXAPP
+#ifdef RTE_EXEC_ENV_LINUX
#include <dirent.h>
#include <fcntl.h>
#endif