From b4274493514c4467dbc6812afff30bcfe43407a5 Mon Sep 17 00:00:00 2001 From: Xavier Simonart Date: Fri, 31 Jan 2020 18:20:15 +0100 Subject: Added support for DPDK 19.11 Change-Id: I58fa7a0ab7aaa27e9f9383f7995bb71bf0952618 Signed-off-by: Xavier Simonart --- VNFs/DPPD-PROX/defaults.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'VNFs/DPPD-PROX/defaults.c') diff --git a/VNFs/DPPD-PROX/defaults.c b/VNFs/DPPD-PROX/defaults.c index 27240484..b839453d 100644 --- a/VNFs/DPPD-PROX/defaults.c +++ b/VNFs/DPPD-PROX/defaults.c @@ -82,9 +82,11 @@ static struct rte_sched_port_params port_params_default = { .frame_overhead = RTE_SCHED_FRAME_OVERHEAD_DEFAULT, .n_subports_per_port = 1, .n_pipes_per_subport = NB_PIPES, +#if RTE_VERSION < RTE_VERSION_NUM(19,11,0,0) .qsize = {QUEUE_SIZES, QUEUE_SIZES, QUEUE_SIZES, QUEUE_SIZES}, .pipe_profiles = NULL, .n_pipe_profiles = 1 /* only one profile */ +#endif }; static struct rte_sched_pipe_params pipe_params_default = { @@ -106,6 +108,11 @@ static struct rte_sched_subport_params subport_params_default = { .tb_size = 4000000, .tc_rate = {TEN_GIGABIT, TEN_GIGABIT, TEN_GIGABIT, TEN_GIGABIT}, .tc_period = 40, /* default was 10 */ +#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) + .qsize = {QUEUE_SIZES, QUEUE_SIZES, QUEUE_SIZES, QUEUE_SIZES}, + .pipe_profiles = NULL, + .n_pipe_profiles = 1 /* only one profile */ +#endif }; void set_global_defaults(__attribute__((unused)) struct prox_cfg *prox_cfg) @@ -137,7 +144,11 @@ void set_task_defaults(struct prox_cfg* prox_cfg, struct lcore_cfg* lcore_cfg_in targ->qos_conf.port_params = port_params_default; targ->qos_conf.pipe_params[0] = pipe_params_default; targ->qos_conf.subport_params[0] = subport_params_default; +#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) + targ->qos_conf.subport_params[0].pipe_profiles = targ->qos_conf.pipe_params; +#else targ->qos_conf.port_params.pipe_profiles = targ->qos_conf.pipe_params; +#endif targ->qos_conf.port_params.rate = TEN_GIGABIT; targ->qinq_tag = ETYPE_8021ad; targ->n_concur_conn = 8192*2; -- cgit 1.2.3-korg