ipsec: Support MPLS over IPSec[46] interface

[vpp.git] / src / vnet / ip / vtep.h

diff --git a/src/vnet/ip/vtep.h b/src/vnet/ip/vtep.h
index 345b6db..4cb0612 100644 (file)
--- a/src/vnet/ip/vtep.h
+++ b/src/vnet/ip/vtep.h
@@ -18,8 +18,7 @@
 
 #include <vppinfra/hash.h>
 #include <vnet/ip/ip.h>
-#include <vnet/ip/ip4.h>
-#include <vnet/ip/ip6.h>
+#include <vnet/ip/ip46_address.h>
 
 /**
  * @brief Tunnel endpoint key (IPv4)
@@ -131,11 +130,11 @@ vtep4_check_vector (vtep_table_t * t, vlib_buffer_t * b0, ip4_header_t * ip40,
 
 #ifdef CLIB_HAVE_VEC512
   u64x8 k4_u64x8 = u64x8_splat (k4.as_u64);
-  u64x8 cache = u64x8_load_aligned (vtep4_u512->vtep4_cache);
+  u64x8 cache = u64x8_load_unaligned (vtep4_u512->vtep4_cache);
   u8 result = u64x8_mask_is_equal (cache, k4_u64x8);
   if (PREDICT_TRUE (result != 0))
     {
-      k4.as_u64 =
+      last_k4->as_u64 =
        vtep4_u512->vtep4_cache[count_trailing_zeros (result)].as_u64;
       return VTEP_CHECK_PASS_UNCHANGED;
     }