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/vFW | |
| parent | 7da9fd5f44d3d65872e4da7feaf2cedea7f8d214 (diff) | |
| parent | a25ebbda95517a2eddb1c8291c258e8e4f167af7 (diff) | |
Merge "VNFs: rte_eth_dev is deprecated in DPDK version 16.11 and onwards"
Diffstat (limited to 'VNFs/vFW')
| -rw-r--r-- | VNFs/vFW/init.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/VNFs/vFW/init.c b/VNFs/vFW/init.c index 54143773..979e1050 100644 --- a/VNFs/vFW/init.c +++ b/VNFs/vFW/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" @@ -536,6 +537,8 @@ app_link_filter_sctp_del(struct app_link_params *l1, struct app_link_params *l2) &filter); } +/* rte_eth_dev is removed in DPDK version 16.11 and onwards */ +#if RTE_VERSION < 0x100b0000 static int app_link_is_virtual(struct app_link_params *p) { @@ -547,7 +550,7 @@ app_link_is_virtual(struct app_link_params *p) return 0; } - +#endif void app_link_up_internal(__rte_unused struct app_params *app, @@ -556,11 +559,12 @@ app_link_up_internal(__rte_unused struct app_params *app, if(app == NULL || cp == NULL) printf("NULL Pointers"); +#if RTE_VERSION < 0x100b0000 if (app_link_is_virtual(cp)) { cp->state = 1; return; } - +#endif ifm_update_linkstatus(cp->pmd_id, IFM_ETH_LINK_UP); /* Mark link as UP */ @@ -574,11 +578,12 @@ app_link_down_internal(__rte_unused struct app_params *app, if(app == NULL || cp == NULL) printf("NULL Pointers"); +#if RTE_VERSION < 0x100b0000 if (app_link_is_virtual(cp)) { cp->state = 0; return; } - +#endif ifm_update_linkstatus(cp->pmd_id, IFM_ETH_LINK_DOWN); /* Mark link as DOWN */ cp->state = 0; |