From b63264c8342e6a1b6971c79550d2af2024b6a4de Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 14 Aug 2018 18:52:30 +0100 Subject: New upstream version 18.08 Change-Id: I32fdf5e5016556d9c0a6d88ddaf1fc468961790a Signed-off-by: Luca Boccassi --- examples/server_node_efd/server/Makefile | 2 +- examples/server_node_efd/server/init.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'examples/server_node_efd/server') diff --git a/examples/server_node_efd/server/Makefile b/examples/server_node_efd/server/Makefile index cbb91ebe..df6614c6 100644 --- a/examples/server_node_efd/server/Makefile +++ b/examples/server_node_efd/server/Makefile @@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV), "linuxapp") +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) $(error This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) endif diff --git a/examples/server_node_efd/server/init.c b/examples/server_node_efd/server/init.c index 07b6882f..af5a18e2 100644 --- a/examples/server_node_efd/server/init.c +++ b/examples/server_node_efd/server/init.c @@ -97,7 +97,6 @@ init_port(uint16_t port_num) struct rte_eth_conf port_conf = { .rxmode = { .mq_mode = ETH_MQ_RX_RSS, - .ignore_offload_bitfield = 1, }, }; const uint16_t rx_rings = 1, tx_rings = num_nodes; @@ -139,7 +138,6 @@ init_port(uint16_t port_num) } txconf = dev_info.default_txconf; - txconf.txq_flags = ETH_TXQ_FLAGS_IGNORE; txconf.offloads = port_conf.txmode.offloads; for (q = 0; q < tx_rings; q++) { retval = rte_eth_tx_queue_setup(port_num, q, tx_ring_size, @@ -310,7 +308,7 @@ init(int argc, char *argv[]) argv += retval; /* get total number of ports */ - total_ports = rte_eth_dev_count(); + total_ports = rte_eth_dev_count_avail(); /* set up array for port data */ mz = rte_memzone_reserve(MZ_SHARED_INFO, sizeof(*info), -- cgit 1.2.3-korg