From 5927d1dd045f17d4a618c5e50dd9d32bdbd4cbbb Mon Sep 17 00:00:00 2001 From: Ido Barnea Date: Tue, 7 Mar 2017 20:33:56 +0200 Subject: Revert "Got rid of get_vm_one_queue(). Separated its uses to many small attributes." This reverts commit cebf5a44b5f28a03b245e43013cc27671a980206. --- src/main_dpdk.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/main_dpdk.h') diff --git a/src/main_dpdk.h b/src/main_dpdk.h index e444ad2b..25b19471 100644 --- a/src/main_dpdk.h +++ b/src/main_dpdk.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2015-2017 Cisco Systems, Inc. + Copyright (c) 2015-2016 Cisco Systems, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,19 +22,10 @@ #include "bp_sim.h" enum { - MAIN_DPDK_DROP_Q = 0, + MAIN_DPDK_DATA_Q = 0, MAIN_DPDK_RX_Q = 1, }; -class CTrexDpdkParams { - public: - uint16_t rx_data_q_num; - uint16_t rx_drop_q_num; - uint16_t rx_desc_num_data_q; - uint16_t rx_desc_num_drop_q; - uint16_t tx_desc_num; -}; - // These are statistics for packets we send, and do not expect to get back (Like ARP) // We reduce them from general statistics we report (and report them separately, so we can keep the assumption // that tx_pkts == rx_pkts and tx_bytes==rx_bytes @@ -92,7 +83,7 @@ class CPhyEthIF { void set_rx_queue(uint8_t rx_queue){ m_rx_queue=rx_queue; } - void conf_queues(); + void configure(uint16_t nb_rx_queue, uint16_t nb_tx_queue, const struct rte_eth_conf *eth_conf); -- cgit 1.2.3-korg