diff options
| author |   Deepak S <deepak.s@linux.intel.com> | 2017-07-14 06:21:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-14 06:21:46 +0000 |
| commit | 04714a4f30a061f39cda864dec2f350e0051a56a (patch) | |
| tree | cdfeec7abdb1bee4c1d7a0e9da1b4244030b30d5 /VNFs/vCGNAPT/init.c | |
| parent | 7da9fd5f44d3d65872e4da7feaf2cedea7f8d214 (diff) | |
| parent | a25ebbda95517a2eddb1c8291c258e8e4f167af7 (diff) | |
Merge "VNFs: rte_eth_dev is deprecated in DPDK version 16.11 and onwards"
Diffstat (limited to 'VNFs/vCGNAPT/init.c')
| -rw-r--r-- | VNFs/vCGNAPT/init.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/VNFs/vCGNAPT/init.c b/VNFs/vCGNAPT/init.c index f4d4588b..aa3868d8 100644 --- a/VNFs/vCGNAPT/init.c +++ b/VNFs/vCGNAPT/init.c @@ -24,6 +24,7 @@ #include <rte_ip.h> #include <rte_eal.h> #include <rte_malloc.h> +#include <rte_version.h> #include "app.h" #include "pipeline.h" @@ -600,6 +601,8 @@ app_link_set_tcp_syn_filter(struct app_params *app, struct app_link_params *cp) } } +/* rte_eth_dev is removed in DPDK version 16.11 and onwards */ +#if RTE_VERSION < 0x100b0000 static int app_link_is_virtual(__rte_unused struct app_link_params *p) { @@ -611,6 +614,8 @@ app_link_is_virtual(__rte_unused struct app_link_params *p) } #endif +#endif + void app_link_up_internal(__rte_unused struct app_params *app, struct app_link_params *cp) { @@ -619,11 +624,12 @@ app_link_up_internal(__rte_unused struct app_params *app, struct app_link_params int status; struct rte_eth_link link; +#if RTE_VERSION < 0x100b0000 if (app_link_is_virtual(cp)) { cp->state = 1; return; } - +#endif /* For each link, add filters for IP of current link */ if (cp->ip != 0) { @@ -739,10 +745,13 @@ app_link_down_internal(__rte_unused struct app_params *app, struct app_link_para int status; struct rte_eth_link link; +#if RTE_VERSION < 0x100b0000 if (app_link_is_virtual(cp)) { cp->state = 0; return; } +#endif + rte_eth_link_get(cp->pmd_id, &link); if (link.link_status) { /* PMD link down */ |