X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=VNFs%2FDPPD-PROX%2Fprox_lua_types.h;h=83cc73cd55db0e244929ac299bd845e4d40282d3;hb=00f5630bf8a9a625a6ff4b35169a2f1f6ff23703;hp=182c9055efe5f47d5488d0ac06deef6b6c772787;hpb=4eca0440aee462f842567d5ef8b8796c27f4dd1b;p=samplevnf.git

diff --git a/VNFs/DPPD-PROX/prox_lua_types.h b/VNFs/DPPD-PROX/prox_lua_types.h
index 182c9055..83cc73cd 100644
--- a/VNFs/DPPD-PROX/prox_lua_types.h
+++ b/VNFs/DPPD-PROX/prox_lua_types.h
@@ -21,10 +21,10 @@
 #include <rte_ether.h>
 #include <rte_hash.h>
 
+#include "prox_compat.h"
 #include "ip6_addr.h"
 
 struct lua_State;
-struct ether_addr;
 struct ip4_subnet;
 struct ip6_subnet;
 struct next_hop;
@@ -70,10 +70,10 @@ struct lpm6 {
 
 struct ipv6_tun_binding_entry {
 	struct ipv6_addr        endpoint_addr;  // IPv6 local addr
-	struct ether_addr       next_hop_mac;   // mac addr of next hop towards lwB4
+	prox_rte_ether_addr       next_hop_mac;   // mac addr of next hop towards lwB4
 	uint32_t                public_ipv4;    // Public IPv4 address
 	uint16_t                public_port;    // Public base port (together with port mask, defines the Port Set)
-} __attribute__((__packed__));
+} __attribute__((__packed__)) __attribute__((__aligned__(2)));
 
 struct ipv6_tun_binding_table {
 	uint32_t                num_binding_entries;
@@ -86,7 +86,7 @@ struct cpe_table_entry {
 	uint32_t svlan;
 	uint32_t cvlan;
 	uint32_t ip;
-	struct ether_addr eth_addr;
+	prox_rte_ether_addr eth_addr;
 	uint32_t user;
 };
 
@@ -115,7 +115,7 @@ int lua_getfrom(struct lua_State *L, enum lua_place from, const char *name);
 int lua_to_port(struct lua_State *L, enum lua_place from, const char *name, uint16_t *port);
 int lua_to_ip(struct lua_State *L, enum lua_place from, const char *name, uint32_t *ip);
 int lua_to_ip6(struct lua_State *L, enum lua_place from, const char *name, uint8_t *ip);
-int lua_to_mac(struct lua_State *L, enum lua_place from, const char *name, struct ether_addr *mac);
+int lua_to_mac(struct lua_State *L, enum lua_place from, const char *name, prox_rte_ether_addr *mac);
 int lua_to_cidr(struct lua_State *L, enum lua_place from, const char *name, struct ip4_subnet *cidr);
 int lua_to_cidr6(struct lua_State *L, enum lua_place from, const char *name, struct ip6_subnet *cidr);
 int lua_to_int(struct lua_State *L, enum lua_place from, const char *name, uint32_t *val);