X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fvxlan%2Fvxlan.c;h=32647496a76b85c4f0be3a43008cd16e85fbedd0;hb=47d41ad62c5d6008e72d2e9c137cf8f49ca86353;hp=c274cdb01200de0dd3c14d3249db1fbde5ad91c3;hpb=1f50bf8fc57ebf78f9056185a342493be460a847;p=vpp.git

diff --git a/src/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c
index c274cdb0120..32647496a76 100644
--- a/src/vnet/vxlan/vxlan.c
+++ b/src/vnet/vxlan/vxlan.c
@@ -311,7 +311,7 @@ vtep_addr_unref (ip46_address_t * ip)
   uword *vtep = ip46_address_is_ip4 (ip) ?
     hash_get (vxlan_main.vtep4, ip->ip4.as_u32) :
     hash_get_mem (vxlan_main.vtep6, &ip->ip6);
-  ASSERT (vtep);
+  ALWAYS_ASSERT (vtep);
   if (--(*vtep) != 0)
     return *vtep;
   ip46_address_is_ip4 (ip) ?
@@ -337,7 +337,7 @@ mcast_shared_get (ip46_address_t * ip)
 {
   ASSERT (ip46_address_is_multicast (ip));
   uword *p = hash_get_mem (vxlan_main.mcast_shared, ip);
-  ASSERT (p);
+  ALWAYS_ASSERT (p);
   mcast_shared_t ret = {.as_u64 = *p };
   return ret;
 }
@@ -1117,7 +1117,7 @@ set_ip6_vxlan_bypass (vlib_main_t * vm,
 VLIB_CLI_COMMAND (set_interface_ip6_vxlan_bypass_command, static) = {
   .path = "set interface ip6 vxlan-bypass",
   .function = set_ip6_vxlan_bypass,
-  .short_help = "set interface ip vxlan-bypass <interface> [del]",
+  .short_help = "set interface ip6 vxlan-bypass <interface> [del]",
 };
 /* *INDENT-ON* */
 
@@ -1134,9 +1134,11 @@ vnet_vxlan_add_del_rx_flow (u32 hw_if_index, u32 t_index, int is_add)
 	  vxlan_main_t *vxm = &vxlan_main;
 	  vnet_flow_t flow = {
 	    .actions =
-	      VNET_FLOW_ACTION_REDIRECT_TO_NODE | VNET_FLOW_ACTION_MARK,
+	      VNET_FLOW_ACTION_REDIRECT_TO_NODE | VNET_FLOW_ACTION_MARK |
+	      VNET_FLOW_ACTION_BUFFER_ADVANCE,
 	    .mark_flow_id = t->dev_instance + vxm->flow_id_start,
 	    .redirect_node_index = vxlan4_flow_input_node.index,
+	    .buffer_advance = sizeof (ethernet_header_t),
 	    .type = VNET_FLOW_TYPE_IP4_VXLAN,
 	    .ip4_vxlan = {
 			  .src_addr = t->dst.ip4,