VPP-19: Split the lookup.h IP_LOOKUP_NEXT enum.

[vpp.git] / vnet / vnet / ip / ip6_neighbor.c

diff --git a/vnet/vnet/ip/ip6_neighbor.c b/vnet/vnet/ip/ip6_neighbor.c
index 329cc6d..f161036 100644 (file)
--- a/vnet/vnet/ip/ip6_neighbor.c
+++ b/vnet/vnet/ip/ip6_neighbor.c
@@ -751,7 +751,7 @@ icmp6_neighbor_solicitation_or_advertisement (vlib_main_t * vm,
               /* Allow all realistic-looking rewrite adjacencies to pass */
               ni0 = adj0->lookup_next_index;
               is_rewrite0 = (ni0 >= IP_LOOKUP_NEXT_ARP) &&
-                (ni0 < IP_LOOKUP_N_NEXT);
+                (ni0 < IP6_LOOKUP_N_NEXT);
 
              error0 = ((adj0->rewrite_header.sw_if_index != sw_if_index0
                          || ! is_rewrite0)
@@ -847,7 +847,7 @@ icmp6_neighbor_solicitation_or_advertisement (vlib_main_t * vm,
 
               /* Reuse current MAC header, copy SMAC to DMAC and 
                * interface MAC to SMAC */
-              vlib_buffer_reset (p0);
+              vlib_buffer_advance(p0, - ethernet_buffer_header_size(p0));
               eth0 = vlib_buffer_get_current(p0);
               clib_memcpy(eth0->dst_address, eth0->src_address, 6);
               clib_memcpy(eth0->src_address, eth_if0->address, 6);
@@ -3241,7 +3241,7 @@ ip6_neighbor_add_del_adj_cb (struct ip_lookup_main_t * lm,
         {
           if (!n)
             clib_warning("Adjacency contains unknown ND next hop %U (del)",
-                         format_ip46_address, &adj->arp.next_hop);
+                         format_ip46_address, &adj->arp.next_hop, IP46_TYPE_IP6);
           else
             ip6_neighbor_entry_del_adj(n, adj->heap_handle);
         }
@@ -3249,7 +3249,7 @@ ip6_neighbor_add_del_adj_cb (struct ip_lookup_main_t * lm,
         {
           if (!n)
             clib_warning("Adjacency contains unknown ND next hop %U (add)",
-                         format_ip46_address, &adj->arp.next_hop);
+                         format_ip46_address, &adj->arp.next_hop, IP46_TYPE_IP6);
           else
             ip6_neighbor_entry_add_adj(n, adj->heap_handle);
         }