2 files changed, 4 insertions, 1 deletions
diff --git a/src/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c
index 9a68ae80154..356cd3d9aa4 100644
--- a/src/vnet/vxlan/vxlan.c
+++ b/src/vnet/vxlan/vxlan.c
@@ -374,7 +374,7 @@ int vnet_vxlan_add_del_tunnel
 	  return VNET_API_ERROR_INVALID_DECAP_NEXT;
 
       pool_get_aligned (vxm->tunnels, t, CLIB_CACHE_LINE_BYTES);
-      *t = (vxlan_tunnel_t){ 0 };
+      memset(t, 0, sizeof(*t));
       dev_instance = t - vxm->tunnels;
 
       /* copy from arg structure */
diff --git a/src/vnet/vxlan/vxlan.h b/src/vnet/vxlan/vxlan.h
index e8bb272d759..74ab8e04a3e 100644
--- a/src/vnet/vxlan/vxlan.h
+++ b/src/vnet/vxlan/vxlan.h
@@ -66,6 +66,9 @@ typedef CLIB_PACKED(struct {
 }) vxlan6_tunnel_key_t;
 
 typedef struct {
+  /* Required for pool_get_aligned */
+  CLIB_CACHE_LINE_ALIGN_MARK(cacheline0);
+
   /* Rewrite string. $$$$ embed vnet_rewrite header */
   u8 * rewrite;