Harmonize vec/pool_get_aligned object sizes and alignment requests

[vpp.git] / src / vnet / map / map.h

diff --git a/src/vnet/map/map.h b/src/vnet/map/map.h
index 8bae222..c304a1e 100644 (file)
--- a/src/vnet/map/map.h
+++ b/src/vnet/map/map.h
@@ -80,6 +80,8 @@ typedef enum
  */
 typedef struct
 {
+  /* Required for pool_get_aligned */
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
   ip6_address_t ip6_src;
   ip6_address_t ip6_prefix;
   ip6_address_t *rules;
@@ -242,6 +244,8 @@ typedef struct {
   bool sec_check_frag;         /* Inbound security check for (subsequent) fragments */
   bool icmp6_enabled;          /* Send destination unreachable for security check failure */
 
+  bool is_ce;                   /* If this MAP node is a Customer Edge router*/
+
   /* ICMPv6 -> ICMPv4 relay parameters */
   ip4_address_t icmp4_src_address;
   vlib_simple_counter_main_t icmp_relayed;
@@ -521,10 +525,6 @@ int map_ip6_reass_conf_lifetime(u16 lifetime_ms);
 int map_ip6_reass_conf_buffers(u32 buffers);
 #define MAP_IP6_REASS_CONF_BUFFERS_MAX (0xffffffff)
 
-
-#define u8_ptr_add(ptr, index) (((u8 *)ptr) + index)
-#define u16_net_add(u, val) clib_host_to_net_u16(clib_net_to_host_u16(u) + (val))
-
 static_always_inline void
 ip4_map_t_embedded_address (map_domain_t *d,
                                 ip6_address_t *ip6, const ip4_address_t *ip4)