From 9d1c6c3ff1f464fc2b99857f9113f5688f9b34f1 Mon Sep 17 00:00:00 2001 From: Luc Provoost Date: Fri, 7 Aug 2020 10:55:32 +0200 Subject: Support DPDK 19.11 rc0 Change-Id: I7ac1bb78fe00407ff66945fcdf7b5d54c9025214 Signed-off-by: Luc Provoost --- VNFs/DPPD-PROX/defaults.c | 4 ++-- VNFs/DPPD-PROX/handle_nsh.c | 2 +- VNFs/DPPD-PROX/prox_args.c | 30 +++++++++++++++--------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/VNFs/DPPD-PROX/defaults.c b/VNFs/DPPD-PROX/defaults.c index ac611d0c..8dd29da9 100644 --- a/VNFs/DPPD-PROX/defaults.c +++ b/VNFs/DPPD-PROX/defaults.c @@ -110,7 +110,7 @@ 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) +#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 */ @@ -154,7 +154,7 @@ 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) +#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; diff --git a/VNFs/DPPD-PROX/handle_nsh.c b/VNFs/DPPD-PROX/handle_nsh.c index 6d67f99d..ba2d14fb 100644 --- a/VNFs/DPPD-PROX/handle_nsh.c +++ b/VNFs/DPPD-PROX/handle_nsh.c @@ -19,7 +19,7 @@ #include #include #include -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) #include #endif diff --git a/VNFs/DPPD-PROX/prox_args.c b/VNFs/DPPD-PROX/prox_args.c index d89481ab..d6bdf818 100644 --- a/VNFs/DPPD-PROX/prox_args.c +++ b/VNFs/DPPD-PROX/prox_args.c @@ -1555,7 +1555,7 @@ static int get_core_cfg(unsigned sindex, char *str, void *data) if (err) { return -1; } -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) targ->qos_conf.subport_params[0].qsize[0] = val; targ->qos_conf.subport_params[0].qsize[1] = val; targ->qos_conf.subport_params[0].qsize[2] = val; @@ -1569,42 +1569,42 @@ static int get_core_cfg(unsigned sindex, char *str, void *data) return 0; } if (STR_EQ(str, "subport tb rate")) { -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) return parse_u64(&targ->qos_conf.subport_params[0].tb_rate, pkey); #else return parse_int(&targ->qos_conf.subport_params[0].tb_rate, pkey); #endif } if (STR_EQ(str, "subport tb size")) { -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) return parse_u64(&targ->qos_conf.subport_params[0].tb_size, pkey); #else return parse_int(&targ->qos_conf.subport_params[0].tb_size, pkey); #endif } if (STR_EQ(str, "subport tc 0 rate")) { -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) return parse_u64(&targ->qos_conf.subport_params[0].tc_rate[0], pkey); #else return parse_int(&targ->qos_conf.subport_params[0].tc_rate[0], pkey); #endif } if (STR_EQ(str, "subport tc 1 rate")) { -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) return parse_u64(&targ->qos_conf.subport_params[0].tc_rate[1], pkey); #else return parse_int(&targ->qos_conf.subport_params[0].tc_rate[1], pkey); #endif } if (STR_EQ(str, "subport tc 2 rate")) { -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) return parse_u64(&targ->qos_conf.subport_params[0].tc_rate[2], pkey); #else return parse_int(&targ->qos_conf.subport_params[0].tc_rate[2], pkey); #endif } if (STR_EQ(str, "subport tc 3 rate")) { -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) return parse_u64(&targ->qos_conf.subport_params[0].tc_rate[3], pkey); #else return parse_int(&targ->qos_conf.subport_params[0].tc_rate[3], pkey); @@ -1626,21 +1626,21 @@ static int get_core_cfg(unsigned sindex, char *str, void *data) return 0; } if (STR_EQ(str, "subport tc period")) { -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) return parse_u64(&targ->qos_conf.subport_params[0].tc_period, pkey); #else return parse_int(&targ->qos_conf.subport_params[0].tc_period, pkey); #endif } if (STR_EQ(str, "pipe tb rate")) { -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) return parse_u64(&targ->qos_conf.pipe_params[0].tb_rate, pkey); #else return parse_int(&targ->qos_conf.pipe_params[0].tb_rate, pkey); #endif } if (STR_EQ(str, "pipe tb size")) { -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) return parse_u64(&targ->qos_conf.pipe_params[0].tb_size, pkey); #else return parse_int(&targ->qos_conf.pipe_params[0].tb_size, pkey); @@ -1660,35 +1660,35 @@ static int get_core_cfg(unsigned sindex, char *str, void *data) return 0; } if (STR_EQ(str, "pipe tc 0 rate")) { -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) return parse_u64(&targ->qos_conf.pipe_params[0].tc_rate[0], pkey); #else return parse_int(&targ->qos_conf.pipe_params[0].tc_rate[0], pkey); #endif } if (STR_EQ(str, "pipe tc 1 rate")) { -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) return parse_u64(&targ->qos_conf.pipe_params[0].tc_rate[1], pkey); #else return parse_int(&targ->qos_conf.pipe_params[0].tc_rate[1], pkey); #endif } if (STR_EQ(str, "pipe tc 2 rate")) { -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) return parse_u64(&targ->qos_conf.pipe_params[0].tc_rate[2], pkey); #else return parse_int(&targ->qos_conf.pipe_params[0].tc_rate[2], pkey); #endif } if (STR_EQ(str, "pipe tc 3 rate")) { -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) return parse_u64(&targ->qos_conf.pipe_params[0].tc_rate[3], pkey); #else return parse_int(&targ->qos_conf.pipe_params[0].tc_rate[3], pkey); #endif } if (STR_EQ(str, "pipe tc period")) { -#if RTE_VERSION >= RTE_VERSION_NUM(19,11,0,0) +#if RTE_VERSION > RTE_VERSION_NUM(19,11,0,0) return parse_u64(&targ->qos_conf.pipe_params[0].tc_period, pkey); #else return parse_int(&targ->qos_conf.pipe_params[0].tc_period, pkey); -- cgit 1.2.3-korg