diff options
author | Xavier Simonart <xavier.simonart@intel.com> | 2018-07-04 11:46:25 +0200 |
---|---|---|
committer | Patrice Buriez <patrice.buriez@intel.com> | 2018-07-26 14:53:10 +0000 |
commit | 3e532aca841cbd004515930496495bea50e9b52a (patch) | |
tree | 605be5411383030f74d7c3760a60179c085d2f91 /VNFs/DPPD-PROX/vxlangpe_nsh.h | |
parent | 247bf8232dacf0108eb46efe8cf2151bbf855b8a (diff) |
Initial support for DPDK 18.05
This patch makes PROX compile with DPDK 18.05.
However some features are disabled or will not work as expected
such as:
"mem info" command
"police" mode
Those will need to be fixed later (see DPDK1805 within code).
Change-Id: Ie7d72f6ab3db68bc093c42d60d125fe86f8fbda7
Signed-off-by: Xavier Simonart <xavier.simonart@intel.com>
Signed-off-by: Patrice Buriez <patrice.buriez@intel.com>
Diffstat (limited to 'VNFs/DPPD-PROX/vxlangpe_nsh.h')
-rw-r--r-- | VNFs/DPPD-PROX/vxlangpe_nsh.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/VNFs/DPPD-PROX/vxlangpe_nsh.h b/VNFs/DPPD-PROX/vxlangpe_nsh.h index 2e7cfc76..5f83650c 100644 --- a/VNFs/DPPD-PROX/vxlangpe_nsh.h +++ b/VNFs/DPPD-PROX/vxlangpe_nsh.h @@ -17,6 +17,8 @@ #ifndef _VXLANGPE_NSH_H_ #define _VXLANGPE_NSH_H_ +#include <rte_version.h> + struct nsh_hdr { uint16_t version :2; uint16_t oa_flag :1; @@ -33,12 +35,13 @@ struct nsh_hdr { uint32_t ctx_4; } __attribute__((__packed__)); +#if RTE_VERSION < RTE_VERSION_NUM(18,5,0,0) struct vxlan_gpe_hdr { uint8_t flag_0; uint8_t flag_1; uint8_t reserved; - uint8_t next_proto; + uint8_t proto; uint32_t vni_res; } __attribute__((__packed__)); - +#endif #endif /* _VXLANGPE_NSH_H_ */ |