diff options
| author |   Deepak S <deepak.s@linux.intel.com> | 2018-07-27 16:13:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-07-27 16:13:49 +0000 |
| commit | 974e4b3123b7d926d548d8924b41e8b732e2732f (patch) | |
| tree | b3cb268bc4b95d1a617710d3e0346234bcf1dcd1 /VNFs/DPPD-PROX/vxlangpe_nsh.h | |
| parent | 2e924e65c5ac509925bc5a28b724db108fe99111 (diff) | |
| parent | 3e532aca841cbd004515930496495bea50e9b52a (diff) | |
Merge "Initial support for DPDK 18.05"
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_ */ |